Swap 'alpha' and 'beta'. Happy debugging!

Telegram/SourceFiles/_other/packer.cpp

@@ -13,8 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 //Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
 #endif
 
-bool AlphaChannel = false;
-quint64 BetaVersion = 0;
+bool BetaChannel = false;
+quint64 AlphaVersion = 0;
 
 const char *PublicKey = "\
 -----BEGIN RSA PUBLIC KEY-----\n\
@@ -24,7 +24,7 @@ BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\
 -----END RSA PUBLIC KEY-----\
 ";
 
-const char *PublicAlphaKey = "\
+const char *PublicBetaKey = "\
 -----BEGIN RSA PUBLIC KEY-----\n\
 MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\
 0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\
@@ -33,11 +33,11 @@ w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
 ";
 
 extern const char *PrivateKey;
-extern const char *PrivateAlphaKey;
+extern const char *PrivateBetaKey;
 #include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing
-#include "../../../../TelegramPrivate/beta_private.h" // private key for beta version file generation
+#include "../../../../TelegramPrivate/alpha_private.h" // private key for alpha version file generation
 
-QString countBetaVersionSignature(quint64 version);
+QString countAlphaVersionSignature(quint64 version);
 
 // sha1 hash
 typedef unsigned char uchar;
@@ -124,7 +124,7 @@ int32 *hashSha1(const void *data, uint32 len, void *dest) {
 	return (int32*)sha1To;
 }
 
-QString BetaSignature;
+QString AlphaSignature;
 
 int main(int argc, char *argv[])
 {
@@ -144,18 +144,18 @@ int main(int argc, char *argv[])
 			target32 = (string("mac32") == argv[i + 1]);
 		} else if (string("-version") == argv[i] && i + 1 < argc) {
 			version = QString(argv[i + 1]).toInt();
-		} else if (string("-alpha") == argv[i]) {
-			AlphaChannel = true;
-		} else if (string("-beta") == argv[i] && i + 1 < argc) {
-			BetaVersion = QString(argv[i + 1]).toULongLong();
-			if (BetaVersion > version * 1000ULL && BetaVersion < (version + 1) * 1000ULL) {
-				AlphaChannel = false;
-				BetaSignature = countBetaVersionSignature(BetaVersion);
-				if (BetaSignature.isEmpty()) {
+		} else if (string("-beta") == argv[i]) {
+			BetaChannel = true;
+		} else if (string("-alpha") == argv[i] && i + 1 < argc) {
+			AlphaVersion = QString(argv[i + 1]).toULongLong();
+			if (AlphaVersion > version * 1000ULL && AlphaVersion < (version + 1) * 1000ULL) {
+				BetaChannel = false;
+				AlphaSignature = countAlphaVersionSignature(AlphaVersion);
+				if (AlphaSignature.isEmpty()) {
 					return -1;
 				}
 			} else {
-				cout << "Bad -beta param value passed, should be for the same version: " << version << ", beta: " << BetaVersion << "\n";
+				cout << "Bad -alpha param value passed, should be for the same version: " << version << ", alpha: " << AlphaVersion << "\n";
 				return -1;
 			}
 		}
@@ -211,9 +211,9 @@ int main(int argc, char *argv[])
 		QDataStream stream(&buffer);
 		stream.setVersion(QDataStream::Qt_5_1);
 
-		if (BetaVersion) {
+		if (AlphaVersion) {
 			stream << quint32(0x7FFFFFFF);
-			stream << quint64(BetaVersion);
+			stream << quint64(AlphaVersion);
 		} else {
 			stream << quint32(version);
 		}
@@ -407,7 +407,7 @@ int main(int argc, char *argv[])
 	uint32 siglen = 0;
 
 	cout << "Signing..\n";
-	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>((AlphaChannel || BetaVersion) ? PrivateAlphaKey : PrivateKey), -1), 0, 0, 0);
+	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>((BetaChannel || AlphaVersion) ? PrivateBetaKey : PrivateKey), -1), 0, 0, 0);
 	if (!prKey) {
 		cout << "Could not read RSA private key!\n";
 		return -1;
@@ -430,7 +430,7 @@ int main(int argc, char *argv[])
 	}
 
 	cout << "Checking signature..\n";
-	RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>((AlphaChannel || BetaVersion) ? PublicAlphaKey : PublicKey), -1), 0, 0, 0);
+	RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>((BetaChannel || AlphaVersion) ? PublicBetaKey : PublicKey), -1), 0, 0, 0);
 	if (!pbKey) {
 		cout << "Could not read RSA public key!\n";
 		return -1;
@@ -443,18 +443,18 @@ int main(int argc, char *argv[])
 	cout << "Signature verified!\n";
 	RSA_free(pbKey);
 #ifdef Q_OS_WIN
-	QString outName(QString("tupdate%1").arg(BetaVersion ? BetaVersion : version));
+	QString outName(QString("tupdate%1").arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_MAC
-	QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(BetaVersion ? BetaVersion : version));
+	QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_LINUX32
-	QString outName(QString("tlinux32upd%1").arg(BetaVersion ? BetaVersion : version));
+	QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_LINUX64
-	QString outName(QString("tlinuxupd%1").arg(BetaVersion ? BetaVersion : version));
+	QString outName(QString("tlinuxupd%1").arg(AlphaVersion ? AlphaVersion : version));
 #else
 #error Unknown platform!
 #endif
-	if (BetaVersion) {
-		outName += "_" + BetaSignature;
+	if (AlphaVersion) {
+		outName += "_" + AlphaSignature;
 	}
 	QFile out(outName);
 	if (!out.open(QIODevice::WriteOnly)) {
@@ -464,14 +464,14 @@ int main(int argc, char *argv[])
 	out.write(compressed);
 	out.close();
 
-	if (BetaVersion) {
-		QString keyName(QString("tbeta_%1_key").arg(BetaVersion));
+	if (AlphaVersion) {
+		QString keyName(QString("talpha_%1_key").arg(AlphaVersion));
 		QFile key(keyName);
 		if (!key.open(QIODevice::WriteOnly)) {
 			cout << "Can't open '" << keyName.toUtf8().constData() << "' for write..\n";
 			return -1;
 		}
-		key.write(BetaSignature.toUtf8());
+		key.write(AlphaSignature.toUtf8());
 		key.close();
 	}
 
@@ -480,10 +480,10 @@ int main(int argc, char *argv[])
 	return 0;
 }
 
-QString countBetaVersionSignature(quint64 version) { // duplicated in autoupdater.cpp
-	QByteArray cBetaPrivateKey(BetaPrivateKey);
-	if (cBetaPrivateKey.isEmpty()) {
-		cout << "Error: Trying to count beta version signature without beta private key!\n";
+QString countAlphaVersionSignature(quint64 version) { // duplicated in autoupdater.cpp
+	QByteArray cAlphaPrivateKey(AlphaPrivateKey);
+	if (cAlphaPrivateKey.isEmpty()) {
+		cout << "Error: Trying to count alpha version signature without alpha private key!\n";
 		return QString();
 	}
 
@@ -496,27 +496,27 @@ QString countBetaVersionSignature(quint64 version) { // duplicated in autoupdate
 
 	uint32 siglen = 0;
 
-	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cBetaPrivateKey.constData()), -1), 0, 0, 0);
+	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cAlphaPrivateKey.constData()), -1), 0, 0, 0);
 	if (!prKey) {
-		cout << "Error: Could not read beta private key!\n";
+		cout << "Error: Could not read alpha private key!\n";
 		return QString();
 	}
 	if (RSA_size(prKey) != keySize) {
-		cout << "Error: Bad beta private key size: " << RSA_size(prKey) << "\n";
+		cout << "Error: Bad alpha private key size: " << RSA_size(prKey) << "\n";
 		RSA_free(prKey);
 		return QString();
 	}
 	QByteArray signature;
 	signature.resize(keySize);
 	if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature
-		cout << "Error: Counting beta version signature failed!\n";
+		cout << "Error: Counting alpha version signature failed!\n";
 		RSA_free(prKey);
 		return QString();
 	}
 	RSA_free(prKey);
 
 	if (siglen != keySize) {
-		cout << "Error: Bad beta version signature length: " << siglen << "\n";
+		cout << "Error: Bad alpha version signature length: " << siglen << "\n";
 		return QString();
 	}
 

Telegram/SourceFiles/_other/updater.cpp

@@ -144,7 +144,7 @@ bool update() {
 		if (!ReadFile(versionFile, &versionNum, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD)) {
 			versionNum = 0;
 		} else {
-			if (versionNum == 0x7FFFFFFF) { // beta version
+			if (versionNum == 0x7FFFFFFF) { // alpha version
 
 			} else if (!ReadFile(versionFile, &versionLen, sizeof(DWORD), &readLen, NULL) || readLen != sizeof(DWORD) || versionLen > 63) {
 				versionNum = 0;

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()) + (cAlphaVersion() ? " alpha" : "") + (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString())), st::aboutVersionLink)
+: _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cBetaVersion() ? " 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) {
@@ -59,7 +59,7 @@ void AboutBox::resizeEvent(QResizeEvent *e) {
 }
 
 void AboutBox::showVersionHistory() {
-	if (cRealBetaVersion()) {
+	if (cRealAlphaVersion()) {
 		auto url = qsl("https://tdesktop.com/");
 		switch (cPlatform()) {
 		case dbipWindows: url += qsl("win/%1.zip"); break;
@@ -68,11 +68,11 @@ void AboutBox::showVersionHistory() {
 		case dbipLinux32: url += qsl("linux32/%1.tar.xz"); break;
 		case dbipLinux64: url += qsl("linux/%1.tar.xz"); break;
 		}
-		url = url.arg(qsl("tbeta%1_%2").arg(cRealBetaVersion()).arg(Core::countBetaVersionSignature(cRealBetaVersion())));
+		url = url.arg(qsl("talpha%1_%2").arg(cRealAlphaVersion()).arg(Core::countAlphaVersionSignature(cRealAlphaVersion())));
 
 		Application::clipboard()->setText(url);
 
-		Ui::show(Box<InformBox>("The link to the current private beta version of Telegram Desktop was copied to the clipboard."));
+		Ui::show(Box<InformBox>("The link to the current private alpha version of Telegram Desktop was copied to the clipboard."));
 	} else {
 		QDesktopServices::openUrl(qsl("https://desktop.telegram.org/changelog"));
 	}
@@ -99,11 +99,11 @@ QString telegramFaqLink() {
 
 QString currentVersionText() {
 	auto result = QString::fromLatin1(AppVersionStr.c_str());
-	if (cAlphaVersion()) {
-		result += " alpha";
-	}
 	if (cBetaVersion()) {
-		result += qsl(" beta %1").arg(cBetaVersion() % 1000);
+		result += " beta";
+	}
+	if (cAlphaVersion()) {
+		result += qsl(" alpha %1").arg(cAlphaVersion() % 1000);
 	}
 	return result;
 }

Telegram/SourceFiles/config.h

@@ -186,7 +186,7 @@ BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\
 -----END RSA PUBLIC KEY-----\
 ";
 
-static const char *UpdatesPublicAlphaKey = "\
+static const char *UpdatesPublicBetaKey = "\
 -----BEGIN RSA PUBLIC KEY-----\n\
 MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\
 0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\
@@ -205,14 +205,14 @@ static const char *ApiHash = "344583e45741c457fe1862106095a5eb";
 #error "Only little endian is supported!"
 #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN
 
-#ifndef BETA_VERSION_MACRO
-#error "Beta version macro is not defined."
+#ifndef ALPHA_VERSION_MACRO
+#error "Alpha version macro is not defined."
 #endif
 
-#if (defined CUSTOM_API_ID) && (BETA_VERSION_MACRO > 0ULL)
-#include "../../../TelegramPrivate/beta_private.h" // private key for downloading closed betas
+#if (defined CUSTOM_API_ID) && (ALPHA_VERSION_MACRO > 0ULL)
+#include "../../../TelegramPrivate/alpha_private.h" // private key for downloading closed alphas
 #else
-static const char *BetaPrivateKey = "";
+static const char *AlphaPrivateKey = "";
 #endif
 
 extern QString gKeyFile;

Telegram/SourceFiles/core/changelogs.cpp

@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Core {
 namespace {
 
-std::map<int, const char*> AlphaLogs() {
+std::map<int, const char*> BetaLogs() {
 	return {
 	{
 		1002024,
@@ -118,8 +118,8 @@ void Changelogs::requestCloudLogs() {
 }
 
 void Changelogs::addLocalLogs() {
-	if (cAlphaVersion() || cBetaVersion()) {
-		addAlphaLogs();
+	if (cBetaVersion() || cAlphaVersion()) {
+		addBetaLogs();
 	}
 	if (!_addedSomeLocal) {
 		const auto text = lng_new_version_wrap(
@@ -143,13 +143,13 @@ void Changelogs::addLocalLog(const QString &text) {
 	_addedSomeLocal = true;
 };
 
-void Changelogs::addAlphaLogs() {
-	for (const auto[version, changes] : AlphaLogs()) {
-		addAlphaLog(version, changes);
+void Changelogs::addBetaLogs() {
+	for (const auto[version, changes] : BetaLogs()) {
+		addBetaLog(version, changes);
 	}
 }
 
-void Changelogs::addAlphaLog(int changeVersion, const char *changes) {
+void Changelogs::addBetaLog(int changeVersion, const char *changes) {
 	if (_oldVersion >= changeVersion) {
 		return;
 	}

Telegram/SourceFiles/core/changelogs.h

@@ -24,8 +24,8 @@ private:
 	void requestCloudLogs();
 	void addLocalLogs();
 	void addLocalLog(const QString &text);
-	void addAlphaLogs();
-	void addAlphaLog(int changeVersion, const char *changes);
+	void addBetaLogs();
+	void addBetaLog(int changeVersion, const char *changes);
 
 	const not_null<AuthSession*> _session;
 	const int _oldVersion = 0;

Telegram/SourceFiles/core/crash_report_window.cpp

@@ -228,7 +228,7 @@ LastCrashedWindow::LastCrashedWindow()
 	: std::make_unique<UpdaterData>(this)) {
 	excludeReportUsername();
 
-	if (!cAlphaVersion() && !cBetaVersion()) { // currently accept crash reports only from testers
+	if (!cBetaVersion() && !cAlphaVersion()) { // currently accept crash reports only from testers
 		_sendingState = SendingNoReport;
 	}
 	if (_sendingState != SendingNoReport) {
@@ -281,7 +281,7 @@ LastCrashedWindow::LastCrashedWindow()
 	}
 	if (_sendingState != SendingNoReport) {
 		QString version = getReportField(qstr("version"), qstr("Version:"));
-		QString current = cBetaVersion() ? qsl("-%1").arg(cBetaVersion()) : QString::number(AppVersion);
+		QString current = cAlphaVersion() ? qsl("-%1").arg(cAlphaVersion()) : QString::number(AppVersion);
 		if (version != current) { // currently don't accept crash reports from not current app version
 			_sendingState = SendingNoReport;
 		}
@@ -418,7 +418,7 @@ QString LastCrashedWindow::getReportField(const QLatin1String &name, const QLati
 			QString data = lines.at(i).trimmed().mid(prefix.size()).trimmed();
 
 			if (name == qstr("version")) {
-				if (data.endsWith(qstr(" beta"))) {
+				if (data.endsWith(qstr(" alpha"))) {
 					data = QString::number(-data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong());
 				} else {
 					data = QString::number(data.replace(QRegularExpression(qsl("[^\\d]")), "").toLongLong());

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"] = (cBetaVersion() ? qsl("%1 beta").arg(cBetaVersion()) : (cAlphaVersion() ? qsl("%1 alpha") : qsl("%1")).arg(AppVersion)).toUtf8().constData();
+	ProcessAnnotations["Version"] = (cAlphaVersion() ? qsl("%1 alpha").arg(cAlphaVersion()) : (cBetaVersion() ? 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();

Telegram/SourceFiles/core/update_checker.cpp

@@ -163,7 +163,7 @@ private:
 	std::optional<QString> parseResponse(const QByteArray &response) const;
 	QString validateLatestUrl(
 		uint64 availableVersion,
-		bool isAvailableBeta,
+		bool isAvailableAlpha,
 		QString url) const;
 
 	std::unique_ptr<QNetworkAccessManager> _manager;
@@ -391,15 +391,15 @@ bool UnpackUpdate(const QString &filepath) {
 		return false;
 	}
 
-	RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppAlphaVersion ? UpdatesPublicAlphaKey : UpdatesPublicKey), -1), 0, 0, 0);
+	RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppBetaVersion ? UpdatesPublicBetaKey : UpdatesPublicKey), -1), 0, 0, 0);
 	if (!pbKey) {
 		LOG(("Update Error: cant read public rsa key!"));
 		return false;
 	}
 	if (RSA_verify(NID_sha1, (const uchar*)(compressed.constData() + hSigLen), hShaLen, (const uchar*)(compressed.constData()), hSigLen, pbKey) != 1) { // verify signature
 		RSA_free(pbKey);
-		if (cAlphaVersion() || cBetaVersion()) { // try other public key, if we are in alpha or beta version
-			pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(AppAlphaVersion ? UpdatesPublicKey : UpdatesPublicAlphaKey), -1), 0, 0, 0);
+		if (cBetaVersion() || 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!"));
 				return false;
@@ -488,15 +488,15 @@ bool UnpackUpdate(const QString &filepath) {
 			return false;
 		}
 
-		quint64 betaVersion = 0;
-		if (version == 0x7FFFFFFF) { // beta version
-			stream >> betaVersion;
+		quint64 alphaVersion = 0;
+		if (version == 0x7FFFFFFF) { // alpha version
+			stream >> alphaVersion;
 			if (stream.status() != QDataStream::Ok) {
-				LOG(("Update Error: cant read beta version from downloaded stream, status: %1").arg(stream.status()));
+				LOG(("Update Error: cant read alpha version from downloaded stream, status: %1").arg(stream.status()));
 				return false;
 			}
-			if (!cBetaVersion() || betaVersion <= cBetaVersion()) {
-				LOG(("Update Error: downloaded beta version %1 is not greater, than mine %2").arg(betaVersion).arg(cBetaVersion()));
+			if (!cAlphaVersion() || alphaVersion <= cAlphaVersion()) {
+				LOG(("Update Error: downloaded alpha version %1 is not greater, than mine %2").arg(alphaVersion).arg(cAlphaVersion()));
 				return false;
 			}
 		} else if (int32(version) <= AppVersion) {
@@ -571,8 +571,8 @@ bool UnpackUpdate(const QString &filepath) {
 			return false;
 		}
 		fVersion.write((const char*)&versionNum, sizeof(VersionInt));
-		if (versionNum == 0x7FFFFFFF) { // beta version
-			fVersion.write((const char*)&betaVersion, sizeof(quint64));
+		if (versionNum == 0x7FFFFFFF) { // alpha version
+			fVersion.write((const char*)&alphaVersion, sizeof(quint64));
 		} else {
 			fVersion.write((const char*)&versionLen, sizeof(VersionInt));
 			fVersion.write((const char*)&versionStr[0], versionLen);
@@ -653,14 +653,14 @@ bool ParseCommonMap(
 	}
 	const auto types = (*it).toObject();
 	const auto list = [&]() -> std::vector<QString> {
-		if (cBetaVersion()) {
+		if (cAlphaVersion()) {
 			return { "alpha", "beta", "stable" };
-		} else if (cAlphaVersion()) {
+		} else if (cBetaVersion()) {
 			return { "beta", "stable" };
 		}
 		return { "stable" };
 	}();
-	auto bestIsAvailableBeta = false;
+	auto bestIsAvailableAlpha = false;
 	auto bestAvailableVersion = 0ULL;
 	for (const auto &type : list) {
 		const auto it = types.constFind(type);
@@ -677,7 +677,7 @@ bool ParseCommonMap(
 		if (version == map.constEnd()) {
 			continue;
 		}
-		const auto isAvailableBeta = (type == "alpha");
+		const auto isAvailableAlpha = (type == "alpha");
 		const auto availableVersion = [&] {
 			if ((*version).isString()) {
 				const auto string = (*version).toString();
@@ -695,16 +695,16 @@ bool ParseCommonMap(
 				).arg(platform).arg(type).arg(key));
 			return false;
 		}
-		const auto compare = isAvailableBeta
+		const auto compare = isAvailableAlpha
 			? availableVersion
 			: availableVersion * 1000;
-		const auto bestCompare = bestIsAvailableBeta
+		const auto bestCompare = bestIsAvailableAlpha
 			? bestAvailableVersion
 			: bestAvailableVersion * 1000;
 		if (compare > bestCompare) {
 			bestAvailableVersion = availableVersion;
-			bestIsAvailableBeta = isAvailableBeta;
-			if (!callback(availableVersion, isAvailableBeta, map)) {
+			bestIsAvailableAlpha = isAvailableAlpha;
+			if (!callback(availableVersion, isAvailableAlpha, map)) {
 				return false;
 			}
 		}
@@ -972,24 +972,24 @@ std::optional<QString> HttpChecker::parseOldResponse(
 	}
 	const auto availableVersion = old.captured(1).toULongLong();
 	const auto url = old.captured(2);
-	const auto isAvailableBeta = url.startsWith(qstr("beta_"));
+	const auto isAvailableAlpha = url.startsWith(qstr("beta_"));
 	return validateLatestUrl(
 		availableVersion,
-		isAvailableBeta,
-		isAvailableBeta ? url.mid(5) + "_{signature}" : url);
+		isAvailableAlpha,
+		isAvailableAlpha ? url.mid(5) + "_{signature}" : url);
 }
 
 std::optional<QString> HttpChecker::parseResponse(
 		const QByteArray &response) const {
 	auto bestAvailableVersion = 0ULL;
-	auto bestIsAvailableBeta = false;
+	auto bestIsAvailableAlpha = false;
 	auto bestLink = QString();
 	const auto accumulate = [&](
 			uint64 version,
-			bool isBeta,
+			bool isAlpha,
 			const QJsonObject &map) {
 		bestAvailableVersion = version;
-		bestIsAvailableBeta = isBeta;
+		bestIsAvailableAlpha = isAlpha;
 		const auto link = map.constFind("link");
 		if (link == map.constEnd()) {
 			LOG(("Update Error: Link not found for version %1."
@@ -1009,28 +1009,28 @@ std::optional<QString> HttpChecker::parseResponse(
 	}
 	return validateLatestUrl(
 		bestAvailableVersion,
-		bestIsAvailableBeta,
+		bestIsAvailableAlpha,
 		Local::readAutoupdatePrefix() + bestLink);
 }
 
 QString HttpChecker::validateLatestUrl(
 		uint64 availableVersion,
-		bool isAvailableBeta,
+		bool isAvailableAlpha,
 		QString url) const {
-	const auto myVersion = isAvailableBeta
-		? cBetaVersion()
+	const auto myVersion = isAvailableAlpha
+		? cAlphaVersion()
 		: uint64(AppVersion);
-	const auto validVersion = (cBetaVersion() || !isAvailableBeta);
+	const auto validVersion = (cAlphaVersion() || !isAvailableAlpha);
 	if (!validVersion || availableVersion <= myVersion) {
 		return QString();
 	}
 	const auto versionUrl = url.replace(
 		"{version}",
 		QString::number(availableVersion));
-	const auto finalUrl = isAvailableBeta
+	const auto finalUrl = isAvailableAlpha
 		? QString(versionUrl).replace(
 			"{signature}",
-			countBetaVersionSignature(availableVersion))
+			countAlphaVersionSignature(availableVersion))
 		: versionUrl;
 	return finalUrl;
 }
@@ -1365,10 +1365,10 @@ auto MtpChecker::parseText(const QByteArray &text) const
 	auto bestLocation = FileLocation();
 	const auto accumulate = [&](
 			uint64 version,
-			bool isBeta,
+			bool isAlpha,
 			const QJsonObject &map) {
-		if (isBeta) {
-			LOG(("Update Error: MTP closed beta found."));
+		if (isAlpha) {
+			LOG(("Update Error: MTP closed alpha found."));
 			return false;
 		}
 		bestAvailableVersion = version;
@@ -1638,7 +1638,7 @@ private:
 	Implementation _httpImplementation;
 	Implementation _mtpImplementation;
 	std::shared_ptr<Loader> _activeLoader;
-	bool _usingMtprotoLoader = (cBetaVersion() != 0);
+	bool _usingMtprotoLoader = (cAlphaVersion() != 0);
 	QPointer<MTP::Instance> _mtproto;
 
 	rpl::lifetime _lifetime;
@@ -1761,8 +1761,8 @@ void Updater::start(bool forceWait) {
 	}
 
 	_retryTimer.cancel();
-	const auto constDelay = cBetaVersion() ? 600 : UpdateDelayConstPart;
-	const auto randDelay = cBetaVersion() ? 300 : UpdateDelayRandPart;
+	const auto constDelay = cAlphaVersion() ? 600 : UpdateDelayConstPart;
+	const auto randDelay = cAlphaVersion() ? 300 : UpdateDelayRandPart;
 	const auto updateInSecs = cLastUpdateCheck()
 		+ constDelay
 		+ int(rand() % randDelay)
@@ -2042,15 +2042,15 @@ bool checkReadyUpdate() {
 			ClearAll();
 			return false;
 		}
-		if (versionNum == 0x7FFFFFFF) { // beta version
-			quint64 betaVersion = 0;
-			if (fVersion.read((char*)&betaVersion, sizeof(quint64)) != sizeof(quint64)) {
-				LOG(("Update Error: cant read beta version from file '%1'").arg(versionPath));
+		if (versionNum == 0x7FFFFFFF) { // alpha version
+			quint64 alphaVersion = 0;
+			if (fVersion.read((char*)&alphaVersion, sizeof(quint64)) != sizeof(quint64)) {
+				LOG(("Update Error: cant read alpha version from file '%1'").arg(versionPath));
 				ClearAll();
 				return false;
 			}
-			if (!cBetaVersion() || betaVersion <= cBetaVersion()) {
-				LOG(("Update Error: cant install beta version %1 having beta version %2").arg(betaVersion).arg(cBetaVersion()));
+			if (!cAlphaVersion() || alphaVersion <= cAlphaVersion()) {
+				LOG(("Update Error: cant install alpha version %1 having alpha version %2").arg(alphaVersion).arg(cAlphaVersion()));
 				ClearAll();
 				return false;
 			}
@@ -2147,9 +2147,9 @@ void UpdateApplication() {
 	}
 }
 
-QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp
-	if (cBetaPrivateKey().isEmpty()) {
-		LOG(("Error: Trying to count beta version signature without beta private key!"));
+QString countAlphaVersionSignature(uint64 version) { // duplicated in packer.cpp
+	if (cAlphaPrivateKey().isEmpty()) {
+		LOG(("Error: Trying to count alpha version signature without alpha private key!"));
 		return QString();
 	}
 
@@ -2162,27 +2162,27 @@ QString countBetaVersionSignature(uint64 version) { // duplicated in packer.cpp
 
 	uint32 siglen = 0;
 
-	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cBetaPrivateKey().constData()), -1), 0, 0, 0);
+	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(cAlphaPrivateKey().constData()), -1), 0, 0, 0);
 	if (!prKey) {
-		LOG(("Error: Could not read beta private key!"));
+		LOG(("Error: Could not read alpha private key!"));
 		return QString();
 	}
 	if (RSA_size(prKey) != keySize) {
-		LOG(("Error: Bad beta private key size: %1").arg(RSA_size(prKey)));
+		LOG(("Error: Bad alpha private key size: %1").arg(RSA_size(prKey)));
 		RSA_free(prKey);
 		return QString();
 	}
 	QByteArray signature;
 	signature.resize(keySize);
 	if (RSA_sign(NID_sha1, (const uchar*)(sha1Buffer), shaSize, (uchar*)(signature.data()), &siglen, prKey) != 1) { // count signature
-		LOG(("Error: Counting beta version signature failed!"));
+		LOG(("Error: Counting alpha version signature failed!"));
 		RSA_free(prKey);
 		return QString();
 	}
 	RSA_free(prKey);
 
 	if (siglen != keySize) {
-		LOG(("Error: Bad beta version signature length: %1").arg(siglen));
+		LOG(("Error: Bad alpha version signature length: %1").arg(siglen));
 		return QString();
 	}
 

Telegram/SourceFiles/core/update_checker.h

@@ -55,6 +55,6 @@ private:
 
 bool checkReadyUpdate();
 void UpdateApplication();
-QString countBetaVersionSignature(uint64 version);
+QString countAlphaVersionSignature(uint64 version);
 
 } // namespace Core

Telegram/SourceFiles/core/version.h

@@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/utils.h"
 
-#define BETA_VERSION_MACRO (1003016007ULL)
+#define ALPHA_VERSION_MACRO (1003016007ULL)
 
 constexpr int AppVersion = 1003016;
 constexpr str_const AppVersionStr = "1.3.16";
-constexpr bool AppAlphaVersion = false;
-constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
+constexpr bool AppBetaVersion = false;
+constexpr uint64 AppAlphaVersion = ALPHA_VERSION_MACRO;

Telegram/SourceFiles/facades.cpp

@@ -371,41 +371,68 @@ uint64 SandboxUserTag = 0;
 
 namespace Sandbox {
 
-bool CheckBetaVersionDir() {
-	QFile beta(cExeDir() + qsl("TelegramBeta_data/tdata/beta"));
-	if (cBetaVersion()) {
-		cForceWorkingDir(cExeDir() + qsl("TelegramBeta_data/"));
-		QDir().mkpath(cWorkingDir() + qstr("tdata"));
-		if (*BetaPrivateKey) {
-			cSetBetaPrivateKey(QByteArray(BetaPrivateKey));
+bool MoveLegacyAlphaFolder() {
+	const auto was = cExeDir() + qsl("TelegramBeta_data");
+	const auto now = cExeDir() + qsl("TelegramAlpha_data");
+	if (QDir(was).exists() && !QDir(now).exists()) {
+		const auto oldFile = was + "/tdata/beta";
+		const auto newFile = was + "/tdata/alpha";
+		if (QFile(oldFile).exists() && !QFile(newFile).exists()) {
+			if (!QFile(oldFile).copy(newFile)) {
+				LOG(("FATAL: Could not copy '%1' to '%2'"
+					).arg(oldFile
+					).arg(newFile));
+				return false;
+			}
 		}
-		if (beta.open(QIODevice::WriteOnly)) {
-			QDataStream dataStream(&beta);
-			dataStream.setVersion(QDataStream::Qt_5_3);
-			dataStream << quint64(cRealBetaVersion()) << cBetaPrivateKey();
-		} else {
-			LOG(("FATAL: Could not open '%1' for writing private key!").arg(beta.fileName()));
+		if (!QDir().rename(was, now)) {
+			LOG(("FATAL: Could not rename '%1' to '%2'"
+				).arg(was
+				).arg(now));
 			return false;
 		}
-	} else if (beta.exists()) {
-		cForceWorkingDir(cExeDir() + qsl("TelegramBeta_data/"));
-		if (beta.open(QIODevice::ReadOnly)) {
-			QDataStream dataStream(&beta);
+	}
+	return true;
+}
+
+bool CheckAlphaVersionDir() {
+	if (!MoveLegacyAlphaFolder()) {
+		return false;
+	}
+	QFile alpha(cExeDir() + qsl("TelegramAlpha_data/tdata/alpha"));
+	if (cAlphaVersion()) {
+		cForceWorkingDir(cExeDir() + qsl("TelegramAlpha_data/"));
+		QDir().mkpath(cWorkingDir() + qstr("tdata"));
+		if (*AlphaPrivateKey) {
+			cSetAlphaPrivateKey(QByteArray(AlphaPrivateKey));
+		}
+		if (alpha.open(QIODevice::WriteOnly)) {
+			QDataStream dataStream(&alpha);
+			dataStream.setVersion(QDataStream::Qt_5_3);
+			dataStream << quint64(cRealAlphaVersion()) << cAlphaPrivateKey();
+		} else {
+			LOG(("FATAL: Could not open '%1' for writing private key!").arg(alpha.fileName()));
+			return false;
+		}
+	} else if (alpha.exists()) {
+		cForceWorkingDir(cExeDir() + qsl("TelegramAlpha_data/"));
+		if (alpha.open(QIODevice::ReadOnly)) {
+			QDataStream dataStream(&alpha);
 			dataStream.setVersion(QDataStream::Qt_5_3);
 
 			quint64 v;
 			QByteArray k;
 			dataStream >> v >> k;
 			if (dataStream.status() == QDataStream::Ok && !k.isEmpty()) {
-				cSetBetaVersion(AppVersion * 1000ULL);
-				cSetBetaPrivateKey(k);
-				cSetRealBetaVersion(v);
+				cSetAlphaVersion(AppVersion * 1000ULL);
+				cSetAlphaPrivateKey(k);
+				cSetRealAlphaVersion(v);
 			} else {
-				LOG(("FATAL: '%1' is corrupted, reinstall private beta!").arg(beta.fileName()));
+				LOG(("FATAL: '%1' is corrupted, reinstall private alpha!").arg(alpha.fileName()));
 				return false;
 			}
 		} else {
-			LOG(("FATAL: could not open '%1' for reading private key!").arg(beta.fileName()));
+			LOG(("FATAL: could not open '%1' for reading private key!").arg(alpha.fileName()));
 			return false;
 		}
 	}
@@ -420,11 +447,11 @@ void WorkingDirReady() {
 		&& QFile(cWorkingDir() + qsl("tdata/withdebug")).exists()) {
 		Logs::SetDebugEnabled(true);
 	}
-	if (cBetaVersion()) {
-		cSetAlphaVersion(false);
-	} else if (!cAlphaVersion() && QFile(cWorkingDir() + qsl("tdata/devversion")).exists()) {
-		cSetAlphaVersion(true);
-	} else if (AppAlphaVersion) {
+	if (cAlphaVersion()) {
+		cSetBetaVersion(false);
+	} else if (!cBetaVersion() && QFile(cWorkingDir() + qsl("tdata/devversion")).exists()) {
+		cSetBetaVersion(true);
+	} else if (AppBetaVersion) {
 		QFile f(cWorkingDir() + qsl("tdata/devversion"));
 		if (!f.exists() && f.open(QIODevice::WriteOnly)) {
 			f.write("1");

Telegram/SourceFiles/facades.h

@@ -185,7 +185,7 @@ inline bool IsTopCorner(ScreenCorner corner) {
 
 namespace Sandbox {
 
-bool CheckBetaVersionDir();
+bool CheckAlphaVersionDir();
 void WorkingDirReady();
 
 void MainThreadTaskAdded();

Telegram/SourceFiles/intro/introphone.cpp

@@ -25,8 +25,8 @@ namespace {
 
 void SendToBannedHelp(const QString &phone) {
 	const auto version = QString::fromLatin1(AppVersionStr.c_str())
-		+ (cAlphaVersion() ? " alpha" : "")
-		+ (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString());
+		+ (cBetaVersion() ? " beta" : "")
+		+ (cAlphaVersion() ? qsl(" alpha %1").arg(cAlphaVersion()) : QString());
 
 	const auto subject = qsl("Banned phone number: ") + phone;
 

Telegram/SourceFiles/logs.cpp

@@ -322,7 +322,7 @@ bool DebugEnabled() {
 void start(not_null<Core::Launcher*> launcher) {
 	Assert(LogsData == 0);
 
-	if (!Sandbox::CheckBetaVersionDir()) {
+	if (!Sandbox::CheckAlphaVersionDir()) {
 		return;
 	}
 
@@ -330,7 +330,7 @@ void start(not_null<Core::Launcher*> launcher) {
 	auto moveOldDataFrom = QString();
 	auto workingDirChosen = false;
 
-	if (cBetaVersion()) {
+	if (cAlphaVersion()) {
 		SetDebugEnabled(true);
 		workingDirChosen = true;
 #if defined Q_OS_MAC || defined Q_OS_LINUX
@@ -397,7 +397,7 @@ void start(not_null<Core::Launcher*> launcher) {
 		LogsData = 0;
 	}
 
-	LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(DebugEnabled())).arg(Logs::b(cTestMode())));
+	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(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName()));
 	LOG(("Initial working dir: %1").arg(initialWorkingDir));
 	LOG(("Working dir: %1").arg(cWorkingDir()));

Telegram/SourceFiles/platform/linux/specific_linux.cpp

@@ -175,81 +175,6 @@ QStringList addr2linestr(uint64 *addresses, int count) {
 	return result;
 }
 
-QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
-	QString initial = QString::fromUtf8(crashdump), result;
-	QStringList lines = initial.split('\n');
-	result.reserve(initial.size());
-	int32 i = 0, l = lines.size();
-
-	while (i < l) {
-		uint64 addresses[1024] = { 0 };
-		for (; i < l; ++i) {
-			result.append(lines.at(i)).append('\n');
-			QString line = lines.at(i).trimmed();
-			if (line == qstr("Backtrace:")) {
-				++i;
-				break;
-			}
-		}
-
-		int32 start = i;
-		for (; i < l; ++i) {
-			QString line = lines.at(i).trimmed();
-			if (line.isEmpty()) break;
-
-			QRegularExpressionMatch m1 = QRegularExpression(qsl("^(.+)\\(([^+]+)\\+([^\\)]+)\\)\\[(.+)\\]$")).match(line);
-			QRegularExpressionMatch m2 = QRegularExpression(qsl("^(.+)\\[(.+)\\]$")).match(line);
-			QString addrstr = m1.hasMatch() ? m1.captured(4) : (m2.hasMatch() ? m2.captured(2) : QString());
-			if (!addrstr.isEmpty()) {
-				uint64 addr = addrstr.startsWith(qstr("0x")) ? addrstr.mid(2).toULongLong(0, 16) : addrstr.toULongLong();
-				if (addr > 1) {
-					addresses[i - start] = addr;
-				}
-			}
-		}
-
-		QStringList addr2line = addr2linestr(addresses, i - start);
-		for (i = start; i < l; ++i) {
-			QString line = lines.at(i).trimmed();
-			if (line.isEmpty()) break;
-
-			result.append(qsl("\n%1. ").arg(i - start));
-			if (line.startsWith(qstr("ERROR: "))) {
-				result.append(line).append('\n');
-				continue;
-			}
-			if (line == qstr("[0x1]")) {
-				result.append(qsl("(0x1 separator)\n"));
-				continue;
-			}
-
-			QRegularExpressionMatch m1 = QRegularExpression(qsl("^(.+)\\(([^+]*)\\+([^\\)]+)\\)(.+)$")).match(line);
-			QRegularExpressionMatch m2 = QRegularExpression(qsl("^(.+)\\[(.+)\\]$")).match(line);
-			if (!m1.hasMatch() && !m2.hasMatch()) {
-				result.append(qstr("BAD LINE: ")).append(line).append('\n');
-				continue;
-			}
-
-			if (m1.hasMatch()) {
-				result.append(demanglestr(m1.captured(2))).append(qsl(" + ")).append(m1.captured(3)).append(qsl(" [")).append(m1.captured(1)).append(qsl("] "));
-				if (!addr2line.at(i - start).isEmpty() && addr2line.at(i - start) != qsl("??:0")) {
-					result.append(qsl(" (")).append(addr2line.at(i - start)).append(qsl(")\n"));
-				} else {
-					result.append(m1.captured(4)).append(qsl(" (demangled)")).append('\n');
-				}
-			} else {
-				result.append('[').append(m2.captured(1)).append(']');
-				if (!addr2line.at(i - start).isEmpty() && addr2line.at(i - start) != qsl("??:0")) {
-					result.append(qsl(" (")).append(addr2line.at(i - start)).append(qsl(")\n"));
-				} else {
-					result.append(' ').append(m2.captured(2)).append('\n');
-				}
-			}
-		}
-	}
-	return result;
-}
-
 bool _removeDirectory(const QString &path) { // from http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c
 	QByteArray pathRaw = QFile::encodeName(path);
 	DIR *d = opendir(pathRaw.constData());
@@ -409,7 +334,7 @@ QString SystemLanguage() {
 void RegisterCustomScheme() {
 #ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
 	auto home = getHomeDir();
-	if (home.isEmpty() || cBetaVersion() || cExeName().isEmpty()) return; // don't update desktop file for beta version
+	if (home.isEmpty() || cAlphaVersion() || cExeName().isEmpty()) return; // don't update desktop file for alpha version
 	if (Core::UpdaterDisabled())
 		return;
 

Telegram/SourceFiles/platform/linux/specific_linux.h

@@ -44,7 +44,6 @@ inline void psCheckLocalSocket(const QString &serverName) {
 }
 
 void psWriteDump();
-QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile);
 
 void psDeleteDir(const QString &dir);
 

Telegram/SourceFiles/platform/mac/specific_mac.h

@@ -43,7 +43,6 @@ inline void psCheckLocalSocket(const QString &serverName) {
 }
 
 void psWriteDump();
-QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile);
 
 void psDeleteDir(const QString &dir);
 

Telegram/SourceFiles/platform/mac/specific_mac.mm

@@ -164,127 +164,6 @@ QStringList atosstr(uint64 *addresses, int count, uint64 base) {
 
 }
 
-QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
-	QString initial = QString::fromUtf8(crashdump), result;
-	QStringList lines = initial.split('\n');
-	result.reserve(initial.size());
-	int32 i = 0, l = lines.size();
-
-	while (i < l) {
-		uint64 addresses[1024] = { 0 };
-		for (; i < l; ++i) {
-			result.append(lines.at(i)).append('\n');
-			QString line = lines.at(i).trimmed();
-			if (line == qstr("Base image addresses:")) {
-				++i;
-				break;
-			}
-		}
-
-		uint64 base = 0;
-		for (int32 start = i; i < l; ++i) {
-			QString line = lines.at(i).trimmed();
-			if (line.isEmpty()) break;
-
-			if (!base) {
-				QRegularExpressionMatch m = QRegularExpression(qsl("^\\d+ (\\d+) \\((.+)\\)")).match(line);
-				if (m.hasMatch()) {
-					if (uint64 address = m.captured(1).toULongLong()) {
-						if (m.captured(2).endsWith(qstr("Contents/MacOS/Telegram"))) {
-							base = address;
-						}
-					}
-				}
-			}
-		}
-		if (base) {
-			result.append(qsl("(base address read: 0x%1)\n").arg(base, 0, 16));
-		} else {
-			result.append(qsl("ERROR: base address not read!\n"));
-		}
-
-		for (; i < l; ++i) {
-			result.append(lines.at(i)).append('\n');
-			QString line = lines.at(i).trimmed();
-			if (line == qstr("Backtrace:")) {
-				++i;
-				break;
-			}
-		}
-
-		int32 start = i;
-		for (; i < l; ++i) {
-			QString line = lines.at(i).trimmed();
-			if (line.isEmpty()) break;
-
-			if (QRegularExpression(qsl("^\\d+")).match(line).hasMatch()) {
-				QStringList lst = line.split(' ', QString::SkipEmptyParts);
-				if (lst.size() > 2) {
-					uint64 addr = lst.at(2).startsWith(qstr("0x")) ? lst.at(2).mid(2).toULongLong(0, 16) : lst.at(2).toULongLong();
-					addresses[i - start] = addr;
-				}
-			}
-		}
-
-		QStringList atos = atosstr(addresses, i - start, base);
-		for (i = start; i < l; ++i) {
-			QString line = lines.at(i).trimmed();
-			if (line.isEmpty()) break;
-
-			if (!QRegularExpression(qsl("^\\d+")).match(line).hasMatch()) {
-				if (!lines.at(i).startsWith(qstr("ERROR: "))) {
-					result.append(qstr("BAD LINE: "));
-				}
-				result.append(line).append('\n');
-				continue;
-			}
-			QStringList lst = line.split(' ', QString::SkipEmptyParts);
-			result.append('\n').append(lst.at(0)).append(qsl(". "));
-			if (lst.size() < 3) {
-				result.append(qstr("BAD LINE: ")).append(line).append('\n');
-				continue;
-			}
-			if (lst.size() > 5 && lst.at(3) == qsl("0x0") && lst.at(4) == qsl("+") && lst.at(5) == qsl("1")) {
-				result.append(qsl("(0x1 separator)\n"));
-				continue;
-			}
-			if (i - start < atos.size()) {
-				if (!atos.at(i - start).isEmpty()) {
-					result.append(atos.at(i - start)).append('\n');
-					continue;
-				}
-			}
-
-			for (int j = 1, s = lst.size();;) {
-				if (lst.at(j).startsWith('_')) {
-					result.append(demanglestr(lst.at(j)));
-					if (++j < s) {
-						result.append(' ');
-						for (;;) {
-							result.append(lst.at(j));
-							if (++j < s) {
-								result.append(' ');
-							} else {
-								break;
-							}
-						}
-					}
-					break;
-				} else if (j > 2) {
-					result.append(lst.at(j));
-				}
-				if (++j < s) {
-					result.append(' ');
-				} else {
-					break;
-				}
-			}
-			result.append(qsl(" [demangled]")).append('\n');
-		}
-	}
-	return result;
-}
-
 void psDeleteDir(const QString &dir) {
 	objc_deleteDir(dir);
 }

Telegram/SourceFiles/platform/win/specific_win.cpp

@@ -1069,172 +1069,6 @@ BOOL _getModuleInfo(HANDLE hProcess, DWORD64 baseAddr, IMAGEHLP_MODULEW64 *pModu
 void psWriteDump() {
 }
 
-char ImageHlpSymbol64[sizeof(IMAGEHLP_SYMBOL64) + StackEntryMaxNameLength];
-QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
-	if (!LoadDbgHelp(true) || cExeName().isEmpty()) {
-		return qsl("ERROR: could not init dbghelp.dll!");
-	}
-
-	HANDLE hProcess = GetCurrentProcess();
-
-	QString initial = QString::fromUtf8(crashdump), result;
-	QStringList lines = initial.split('\n');
-	result.reserve(initial.size());
-	int32 i = 0, l = lines.size();
-	QString versionstr;
-	uint64 version = 0, betaversion = 0;
-	for (;  i < l; ++i) {
-		result.append(lines.at(i)).append('\n');
-		QString line = lines.at(i).trimmed();
-		if (line.startsWith(qstr("Version: "))) {
-			versionstr = line.mid(qstr("Version: ").size()).trimmed();
-			version = versionstr.toULongLong();
-			if (versionstr.endsWith(qstr("beta"))) {
-				if (version % 1000) {
-					betaversion = version;
-				} else {
-					version /= 1000;
-				}
-			}
-			++i;
-			break;
-		}
-	}
-
-	// maybe need to launch another executable
-	QString tolaunch;
-	if ((betaversion && betaversion != cBetaVersion()) || (!betaversion && version && version != AppVersion)) {
-		QString path = cExeDir();
-		QRegularExpressionMatch m = QRegularExpression("deploy/\\d+\\.\\d+/\\d+\\.\\d+\\.\\d+(/|\\.dev/|\\.alpha/|_\\d+/)(Telegram/)?$").match(path);
-		if (m.hasMatch()) {
-			QString base = path.mid(0, m.capturedStart()) + qstr("deploy/");
-			int32 major = version / 1000000, minor = (version % 1000000) / 1000, micro = (version % 1000);
-			base += qsl("%1.%2/%3.%4.%5").arg(major).arg(minor).arg(major).arg(minor).arg(micro);
-			if (betaversion) {
-				base += qsl("_%1").arg(betaversion);
-			} else if (QDir(base + qstr(".dev")).exists()) {
-				base += qstr(".dev");
-			} else if (QDir(base + qstr(".alpha")).exists()) {
-				base += qstr(".alpha");
-			}
-			if (QFile(base + qstr("/Telegram/Telegram.exe")).exists()) {
-				base += qstr("/Telegram");
-			}
-			tolaunch = base + qstr("Telegram.exe");
-		}
-	}
-	if (!tolaunch.isEmpty()) {
-		result.append(qsl("ERROR: for this crashdump executable '%1' should be used!").arg(tolaunch));
-	}
-
-	while (i < l) {
-		for (; i < l; ++i) {
-			result.append(lines.at(i)).append('\n');
-			QString line = lines.at(i).trimmed();
-			if (line == qstr("Backtrace:")) {
-				++i;
-				break;
-			}
-		}
-
-		IMAGEHLP_SYMBOL64 *pSym = NULL;
-		IMAGEHLP_MODULEW64 Module;
-		IMAGEHLP_LINEW64 Line;
-
-		pSym = (IMAGEHLP_SYMBOL64*)ImageHlpSymbol64;
-		memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + StackEntryMaxNameLength);
-		pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-		pSym->MaxNameLength = StackEntryMaxNameLength;
-
-		memset(&Line, 0, sizeof(Line));
-		Line.SizeOfStruct = sizeof(Line);
-
-		memset(&Module, 0, sizeof(Module));
-		Module.SizeOfStruct = sizeof(Module);
-
-		StackEntry csEntry;
-		for (int32 start = i; i < l; ++i) {
-			QString line = lines.at(i).trimmed();
-			if (line.isEmpty()) break;
-
-			result.append(qsl("%1. ").arg(i + 1 - start));
-			if (!QRegularExpression(qsl("^\\d+$")).match(line).hasMatch()) {
-				if (!lines.at(i).startsWith(qstr("ERROR: "))) {
-					result.append(qstr("BAD LINE: "));
-				}
-				result.append(line).append('\n');
-				continue;
-			}
-
-			DWORD64 address = line.toULongLong();
-
-			csEntry.offset = address;
-			csEntry.name[0] = 0;
-			csEntry.undName[0] = 0;
-			csEntry.undFullName[0] = 0;
-			csEntry.offsetFromSmybol = 0;
-			csEntry.offsetFromLine = 0;
-			csEntry.lineFileName[0] = 0;
-			csEntry.lineNumber = 0;
-			csEntry.loadedImageName[0] = 0;
-			csEntry.moduleName[0] = 0;
-
-			if (symGetSymFromAddr64(hProcess, address, &(csEntry.offsetFromSmybol), pSym) != FALSE) {
-				// TODO: Mache dies sicher...!
-				strcpy_s(csEntry.name, pSym->Name);
-
-				unDecorateSymbolName(pSym->Name, csEntry.undName, StackEntryMaxNameLength, UNDNAME_NAME_ONLY);
-				unDecorateSymbolName(pSym->Name, csEntry.undFullName, StackEntryMaxNameLength, UNDNAME_COMPLETE);
-
-				if (symGetLineFromAddr64) {
-					if (symGetLineFromAddr64(hProcess, address, &(csEntry.offsetFromLine), &Line) != FALSE) {
-						csEntry.lineNumber = Line.LineNumber;
-
-						// TODO: Mache dies sicher...!
-						wcscpy_s(csEntry.lineFileName, Line.FileName);
-					}
-				}
-			} else {
-				result.append("ERROR: could not get Sym from Addr! for ").append(QString::number(address)).append('\n');
-				continue;
-			}
-
-			if (_getModuleInfo(hProcess, address, &Module) != FALSE) {
-				// TODO: Mache dies sicher...!
-				wcscpy_s(csEntry.moduleName, Module.ModuleName);
-			}
-			if (csEntry.name[0] == 0) {
-				strcpy_s(csEntry.name, "(function-name not available)");
-			}
-			if (csEntry.undName[0] != 0) {
-				strcpy_s(csEntry.name, csEntry.undName);
-			}
-			if (csEntry.undFullName[0] != 0) {
-				strcpy_s(csEntry.name, csEntry.undFullName);
-			}
-			if (csEntry.lineFileName[0] == 0) {
-				if (csEntry.moduleName[0] == 0) {
-					wcscpy_s(csEntry.moduleName, L"module-name not available");
-				}
-				result.append(csEntry.name).append(qsl(" (%1) 0x%3").arg(QString::fromWCharArray(csEntry.moduleName)).arg(address, 0, 16)).append('\n');
-			} else {
-				QString file = QString::fromWCharArray(csEntry.lineFileName).toLower();
-				int32 index = file.indexOf(qstr("tbuild\\tdesktop\\telegram\\"));
-				if (index >= 0) {
-					file = file.mid(index + qstr("tbuild\\tdesktop\\telegram\\").size());
-					if (file.startsWith(qstr("sourcefiles\\"))) {
-						file = file.mid(qstr("sourcefiles\\").size());
-					}
-				}
-				result.append(csEntry.name).append(qsl(" (%1 - %2) 0x%3").arg(file).arg(csEntry.lineNumber).arg(address, 0, 16)).append('\n');
-			}
-		}
-	}
-
-	symCleanup(hProcess);
-	return result;
-}
-
 void psWriteStackTrace() {
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
 	if (!LoadDbgHelp()) {

Telegram/SourceFiles/platform/win/specific_win.h

@@ -53,7 +53,6 @@ inline void psCheckLocalSocket(const QString &) {
 
 void psWriteDump();
 void psWriteStackTrace();
-QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile);
 
 void psDeleteDir(const QString &dir);
 

Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp

@@ -30,7 +30,7 @@ const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop.Store";
 #else // OS_WIN_STORE
 const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop";
 #endif // OS_WIN_STORE
-const WCHAR AppUserModelIdBeta[] = L"Telegram.TelegramDesktop.Beta";
+const WCHAR AppUserModelIdAlpha[] = L"Telegram.TelegramDesktop.Alpha";
 
 } // namespace
 
@@ -252,8 +252,8 @@ bool validateShortcut() {
 	QString path = systemShortcutPath();
 	if (path.isEmpty() || cExeName().isEmpty()) return false;
 
-	if (cBetaVersion()) {
-		path += qsl("TelegramBeta.lnk");
+	if (cAlphaVersion()) {
+		path += qsl("TelegramAlpha.lnk");
 		if (validateShortcutAt(path)) return true;
 	} else {
 		if (validateShortcutAt(path + qsl("Telegram Desktop/Telegram.lnk"))) return true;
@@ -310,7 +310,7 @@ bool validateShortcut() {
 }
 
 const WCHAR *getId() {
-	return cBetaVersion() ? AppUserModelIdBeta : AppUserModelIdRelease;
+	return cAlphaVersion() ? AppUserModelIdAlpha : AppUserModelIdRelease;
 }
 
 const PROPERTYKEY &getKey() {

Telegram/SourceFiles/settings.cpp

@@ -10,10 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 bool gRtl = false;
 Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight;
 
-bool gAlphaVersion = AppAlphaVersion;
-uint64 gBetaVersion = AppBetaVersion;
-uint64 gRealBetaVersion = AppBetaVersion;
-QByteArray gBetaPrivateKey;
+bool gBetaVersion = AppBetaVersion;
+uint64 gAlphaVersion = AppAlphaVersion;
+uint64 gRealAlphaVersion = AppAlphaVersion;
+QByteArray gAlphaPrivateKey;
 
 bool gTestMode = false;
 bool gManyInstance = false;

Telegram/SourceFiles/settings.h

@@ -28,10 +28,10 @@ inline bool rtl() {
 	return cRtl();
 }
 
-DeclareSetting(bool, AlphaVersion);
-DeclareSetting(uint64, BetaVersion);
-DeclareSetting(uint64, RealBetaVersion);
-DeclareSetting(QByteArray, BetaPrivateKey);
+DeclareSetting(bool, BetaVersion);
+DeclareSetting(uint64, AlphaVersion);
+DeclareSetting(uint64, RealAlphaVersion);
+DeclareSetting(QByteArray, AlphaPrivateKey);
 
 DeclareSetting(bool, TestMode);
 DeclareSetting(QString, LoggedPhoneNumber);

Telegram/build/build.bat

@@ -23,15 +23,15 @@ if "%BuildTarget%" equ "uwp" (
 FOR /F "tokens=1,2* delims= " %%i in (%FullScriptPath%version) do set "%%i=%%j"
 
 set "VersionForPacker=%AppVersion%"
-if %BetaVersion% neq 0 (
-  set "AppVersion=%BetaVersion%"
-  set "AppVersionStrFull=%AppVersionStr%_%BetaVersion%"
-  set "AlphaBetaParam=-beta %BetaVersion%"
-  set "BetaKeyFile=tbeta_%BetaVersion%_key"
+if %AlphaVersion% neq 0 (
+  set "AppVersion=%AlphaVersion%"
+  set "AppVersionStrFull=%AppVersionStr%_%AlphaVersion%"
+  set "AlphaBetaParam=-alpha %AlphaVersion%"
+  set "AlphaKeyFile=talpha_%AlphaVersion%_key"
 ) else (
-  if %AlphaChannel% neq 0 (
-    set "AlphaBetaParam=-alpha"
-    set "AppVersionStrFull=%AppVersionStr%.alpha"
+  if %BetaChannel% neq 0 (
+    set "AlphaBetaParam=-beta"
+    set "AppVersionStrFull=%AppVersionStr%.beta"
   ) else (
     set "AlphaBetaParam="
     set "AppVersionStrFull=%AppVersionStr%"
@@ -76,13 +76,13 @@ if %BuildUWP% neq 0 (
     exit /b 1
   )
 )
-if %BetaVersion% neq 0 (
+if %AlphaVersion% neq 0 (
   if exist %DeployPath%\ (
     echo Deploy folder for version %AppVersionStr% already exists!
     exit /b 1
   )
-  if exist %ReleasePath%\%BetaKeyFile% (
-    echo Beta version key file for version %AppVersion% already exists!
+  if exist %ReleasePath%\%AlphaKeyFile% (
+    echo Alpha version key file for version %AppVersion% already exists!
     exit /b 1
   )
 ) else (
@@ -90,8 +90,8 @@ if %BetaVersion% neq 0 (
     echo Deploy folder for version %AppVersionStr%.alpha already exists!
     exit /b 1
   )
-  if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%.dev\ (
-    echo Deploy folder for version %AppVersionStr%.dev already exists!
+  if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%.beta\ (
+    echo Deploy folder for version %AppVersionStr%.beta already exists!
     exit /b 1
   )
   if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\ (
@@ -138,7 +138,7 @@ if %BuildUWP% equ 0 (
   call "%SignPath%" "Updater.exe"
   if %errorlevel% neq 0 goto error
 
-  if %BetaVersion% equ 0 (
+  if %AlphaVersion% equ 0 (
     iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppVersionFull=%AppVersionStrFull% "/dReleasePath=%ReleasePath%" "%FullScriptPath%setup.iss"
     if %errorlevel% neq 0 goto error
     if not exist "tsetup.%AppVersionStrFull%.exe" goto error
@@ -150,19 +150,19 @@ if %BuildUWP% equ 0 (
   call Packer.exe -version %VersionForPacker% -path %BinaryName%.exe -path Updater.exe %AlphaBetaParam%
   if %errorlevel% neq 0 goto error
 
-  if %BetaVersion% neq 0 (
-    if not exist "%ReleasePath%\%BetaKeyFile%" (
-      echo Beta version key file not found!
+  if %AlphaVersion% neq 0 (
+    if not exist "%ReleasePath%\%AlphaKeyFile%" (
+      echo Alpha version key file not found!
       exit /b 1
     )
 
-    FOR /F "tokens=1* delims= " %%i in (%ReleasePath%\%BetaKeyFile%) do set "BetaSignature=%%i"
+    FOR /F "tokens=1* delims= " %%i in (%ReleasePath%\%AlphaKeyFile%) do set "AlphaSignature=%%i"
   )
   if %errorlevel% neq 0 goto error
 
-  if %BetaVersion% neq 0 (
-    set "UpdateFile=!UpdateFile!_!BetaSignature!"
-    set "PortableFile=tbeta!BetaVersion!_!BetaSignature!.zip"
+  if %AlphaVersion% neq 0 (
+    set "UpdateFile=!UpdateFile!_!AlphaSignature!"
+    set "PortableFile=talpha!AlphaVersion!_!AlphaSignature!.zip"
   )
 )
 
@@ -239,10 +239,10 @@ if %BuildUWP% neq 0 (
   xcopy "%ReleasePath%\Updater.pdb" "%DeployPath%\"
   move "%ReleasePath%\%BinaryName%.exe.pdb" "%DeployPath%\"
   move "%ReleasePath%\Updater.exe.pdb" "%DeployPath%\"
-  if %BetaVersion% equ 0 (
+  if %AlphaVersion% equ 0 (
     move "%ReleasePath%\%SetupFile%" "%DeployPath%\"
   ) else (
-    move "%ReleasePath%\%BetaKeyFile%" "%DeployPath%\"
+    move "%ReleasePath%\%AlphaKeyFile%" "%DeployPath%\"
   )
   move "%ReleasePath%\%UpdateFile%" "%DeployPath%\"
   if %errorlevel% neq 0 goto error
@@ -265,7 +265,7 @@ if %BuildUWP% equ 0 (
 
   if not exist "%DeployPath%\%UpdateFile%" goto error
   if not exist "%DeployPath%\%PortableFile%" goto error
-  if %BetaVersion% equ 0 (
+  if %AlphaVersion% equ 0 (
     if not exist "%DeployPath%\%SetupFile%" goto error
   )
   if not exist "%DeployPath%\%BinaryName%.pdb" goto error
@@ -277,10 +277,10 @@ if %BuildUWP% equ 0 (
 
   xcopy "%DeployPath%\%UpdateFile%" "%FinalDeployPath%\" /Y
   xcopy "%DeployPath%\%PortableFile%" "%FinalDeployPath%\" /Y
-  if %BetaVersion% equ 0 (
+  if %AlphaVersion% equ 0 (
     xcopy "%DeployPath%\%SetupFile%" "%FinalDeployPath%\" /Y
   ) else (
-    xcopy "%DeployPath%\%BetaKeyFile%" "%FinalDeployPath%\" /Y
+    xcopy "%DeployPath%\%AlphaKeyFile%" "%FinalDeployPath%\" /Y
   )
 )
 

Telegram/build/build.sh

@@ -33,17 +33,17 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
 done < "$FullScriptPath/version"
 
 VersionForPacker="$AppVersion"
-if [ "$BetaVersion" != "0" ]; then
-  AppVersion="$BetaVersion"
-  AppVersionStrFull="${AppVersionStr}_${BetaVersion}"
-  AlphaBetaParam="-beta $BetaVersion"
-  BetaKeyFile="tbeta_${AppVersion}_key"
-elif [ "$AlphaChannel" == "0" ]; then
+if [ "$AlphaVersion" != "0" ]; then
+  AppVersion="$AlphaVersion"
+  AppVersionStrFull="${AppVersionStr}_${AlphaVersion}"
+  AlphaBetaParam="-alpha $AlphaVersion"
+  AlphaKeyFile="talpha_${AppVersion}_key"
+elif [ "$BetaChannel" == "0" ]; then
   AppVersionStrFull="$AppVersionStr"
   AlphaBetaParam=''
 else
-  AppVersionStrFull="$AppVersionStr.alpha"
-  AlphaBetaParam='-alpha'
+  AppVersionStrFull="$AppVersionStr.beta"
+  AlphaBetaParam='-beta'
 fi
 
 echo ""
@@ -73,8 +73,8 @@ elif [ "$BuildTarget" == "mac32" ]; then
   ReleasePath="$HomePath/../out/Release"
   BinaryName="Telegram"
 elif [ "$BuildTarget" == "macstore" ]; then
-  if [ "$BetaVersion" != "0" ]; then
-    Error "Can't build macstore beta version!"
+  if [ "$AlphaVersion" != "0" ]; then
+    Error "Can't build macstore alpha version!"
   fi
 
   echo "Building version $AppVersionStrFull for Mac App Store.."
@@ -85,9 +85,9 @@ else
 fi
 
 #if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
-  if [ "$BetaVersion" != "0" ]; then
-    if [ -f "$ReleasePath/$BetaKeyFile" ]; then
-      Error "Beta version key file for version $AppVersion already exists!"
+  if [ "$AlphaVersion" != "0" ]; then
+    if [ -f "$ReleasePath/$AlphaKeyFile" ]; then
+      Error "Alpha version key file for version $AppVersion already exists!"
     fi
 
     if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull" ]; then
@@ -98,8 +98,8 @@ fi
       Error "Deploy folder for version $AppVersionStr.alpha already exists!"
     fi
 
-    if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.dev" ]; then
-      Error "Deploy folder for version $AppVersionStr.dev already exists!"
+    if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.beta" ]; then
+      Error "Deploy folder for version $AppVersionStr.beta already exists!"
     fi
 
     if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr" ]; then
@@ -197,17 +197,17 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
   "./Packer" -path "$BinaryName" -path Updater -version $VersionForPacker $AlphaBetaParam
   echo "Packer done!"
 
-  if [ "$BetaVersion" != "0" ]; then
-    if [ ! -f "$ReleasePath/$BetaKeyFile" ]; then
-      Error "Beta version key file not found!"
+  if [ "$AlphaVersion" != "0" ]; then
+    if [ ! -f "$ReleasePath/$AlphaKeyFile" ]; then
+      Error "Alpha version key file not found!"
     fi
 
     while IFS='' read -r line || [[ -n "$line" ]]; do
-      BetaSignature="$line"
-    done < "$ReleasePath/$BetaKeyFile"
+      AlphaSignature="$line"
+    done < "$ReleasePath/$AlphaKeyFile"
 
-    UpdateFile="${UpdateFile}_${BetaSignature}"
-    SetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz"
+    UpdateFile="${UpdateFile}_${AlphaSignature}"
+    SetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
   fi
 
   SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.sym" | awk -F " " 'END {print $4}'`
@@ -230,8 +230,8 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
   mv "$ReleasePath/$BinaryName" "$DeployPath/$BinaryName/"
   mv "$ReleasePath/Updater" "$DeployPath/$BinaryName/"
   mv "$ReleasePath/$UpdateFile" "$DeployPath/"
-  if [ "$BetaVersion" != "0" ]; then
-    mv "$ReleasePath/$BetaKeyFile" "$DeployPath/"
+  if [ "$AlphaVersion" != "0" ]; then
+    mv "$ReleasePath/$AlphaKeyFile" "$DeployPath/"
   fi
   cd "$DeployPath"
   tar -cJvf "$SetupFile" "$BinaryName/"
@@ -239,8 +239,8 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
   mkdir -p $BackupPath
   cp "$SetupFile" "$BackupPath/"
   cp "$UpdateFile" "$BackupPath/"
-  if [ "$BetaVersion" != "0" ]; then
-    cp -v "$BetaKeyFile" "$BackupPath/"
+  if [ "$AlphaVersion" != "0" ]; then
+    cp -v "$AlphaKeyFile" "$BackupPath/"
   fi
 fi
 
@@ -334,7 +334,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
   echo "Done!"
 
   if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
-    if [ "$BetaVersion" == "0" ]; then
+    if [ "$AlphaVersion" == "0" ]; then
       cd "$ReleasePath"
       cp -f tsetup_template.dmg tsetup.temp.dmg
       TempDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.temp.dmg | awk -F "\t" 'END {print $3}'`
@@ -348,17 +348,17 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
     "./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam
     echo "Packer done!"
 
-    if [ "$BetaVersion" != "0" ]; then
-      if [ ! -f "$ReleasePath/$BetaKeyFile" ]; then
-        Error "Beta version key file not found!"
+    if [ "$AlphaVersion" != "0" ]; then
+      if [ ! -f "$ReleasePath/$AlphaKeyFile" ]; then
+        Error "Alpha version key file not found!"
       fi
 
       while IFS='' read -r line || [[ -n "$line" ]]; do
-        BetaSignature="$line"
-      done < "$ReleasePath/$BetaKeyFile"
+        AlphaSignature="$line"
+      done < "$ReleasePath/$AlphaKeyFile"
 
-      UpdateFile="${UpdateFile}_${BetaSignature}"
-      SetupFile="tbeta${BetaVersion}_${BetaSignature}.zip"
+      UpdateFile="${UpdateFile}_${AlphaSignature}"
+      SetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
     fi
   fi
 
@@ -375,11 +375,11 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
     mkdir "$DeployPath"
     mkdir "$DeployPath/$BinaryName"
     cp -r "$ReleasePath/$BinaryName.app" "$DeployPath/$BinaryName/"
-    if [ "$BetaVersion" != "0" ]; then
+    if [ "$AlphaVersion" != "0" ]; then
       cd "$DeployPath"
       zip -r "$SetupFile" "$BinaryName"
       mv "$SetupFile" "$ReleasePath/"
-      mv "$ReleasePath/$BetaKeyFile" "$DeployPath/"
+      mv "$ReleasePath/$AlphaKeyFile" "$DeployPath/"
     fi
     mv "$ReleasePath/$BinaryName.app.dSYM" "$DeployPath/"
     rm "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName"
@@ -393,16 +393,16 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
       mkdir -p "$BackupPath/tmac"
       cp "$DeployPath/$UpdateFile" "$BackupPath/tmac/"
       cp "$DeployPath/$SetupFile" "$BackupPath/tmac/"
-      if [ "$BetaVersion" != "0" ]; then
-        cp -v "$DeployPath/$BetaKeyFile" "$BackupPath/tmac/"
+      if [ "$AlphaVersion" != "0" ]; then
+        cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tmac/"
       fi
     fi
     if [ "$BuildTarget" == "mac32" ]; then
       mkdir -p "$BackupPath/tmac32"
       cp "$DeployPath/$UpdateFile" "$BackupPath/tmac32/"
       cp "$DeployPath/$SetupFile" "$BackupPath/tmac32/"
-      if [ "$BetaVersion" != "0" ]; then
-        cp -v "$DeployPath/$BetaKeyFile" "$BackupPath/tmac32/"
+      if [ "$AlphaVersion" != "0" ]; then
+        cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tmac32/"
       fi
     fi
   elif [ "$BuildTarget" == "macstore" ]; then

Telegram/build/deploy.sh

@@ -34,14 +34,14 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
   eval $1="$2"
 done < "$FullScriptPath/version"
 
-if [ "$BetaVersion" != "0" ]; then
-  AppVersion="$BetaVersion"
-  AppVersionStrFull="${AppVersionStr}_${BetaVersion}"
-  BetaKeyFile="tbeta_${AppVersion}_key"
-elif [ "$AlphaChannel" == "0" ]; then
+if [ "$AlphaVersion" != "0" ]; then
+  AppVersion="$AlphaVersion"
+  AppVersionStrFull="${AppVersionStr}_${AlphaVersion}"
+  AlphaKeyFile="talpha_${AppVersion}_key"
+elif [ "$BetaChannel" == "0" ]; then
   AppVersionStrFull="$AppVersionStr"
 else
-  AppVersionStrFull="$AppVersionStr.alpha"
+  AppVersionStrFull="$AppVersionStr.beta"
 fi
 
 echo ""
@@ -70,7 +70,7 @@ else
   DeployMac="1"
   DeployWin="1"
   DeployLinux="1"
-  if [ "$BetaVersion" == "0" ]; then
+  if [ "$AlphaVersion" == "0" ]; then
     DeployMac32="1"
     DeployLinux32="1"
     echo "Deploying five versions of $AppVersionStrFull: for Windows, OS X 10.6 and 10.7, OS X 10.8+, Linux 64 bit and Linux 32 bit.."
@@ -108,36 +108,36 @@ Linux32SetupFile="tsetup32.$AppVersionStrFull.tar.xz"
 Linux32RemoteFolder="tlinux32"
 DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull"
 
-if [ "$BetaVersion" != "0" ]; then
+if [ "$AlphaVersion" != "0" ]; then
   if [ "$DeployTarget" == "win" ]; then
-    BetaFilePath="$WinDeployPath/$BetaKeyFile"
+    AlphaFilePath="$WinDeployPath/$AlphaKeyFile"
   elif [ "$DeployTarget" == "mac32" ]; then
-    BetaFilePath="$Mac32DeployPath/$BetaKeyFile"
+    AlphaFilePath="$Mac32DeployPath/$AlphaKeyFile"
   elif [ "$DeployTarget" == "linux" ]; then
-    BetaFilePath="$LinuxDeployPath/$BetaKeyFile"
+    AlphaFilePath="$LinuxDeployPath/$AlphaKeyFile"
   elif [ "$DeployTarget" == "linux32" ]; then
-    BetaFilePath="$Linux32DeployPath/$BetaKeyFile"
+    AlphaFilePath="$Linux32DeployPath/$AlphaKeyFile"
   else
-    BetaFilePath="$MacDeployPath/$BetaKeyFile"
+    AlphaFilePath="$MacDeployPath/$AlphaKeyFile"
   fi
-  if [ ! -f "$BetaFilePath" ]; then
-    Error "Beta key file for $AppVersionStrFull not found."
+  if [ ! -f "$AlphaFilePath" ]; then
+    Error "Alpha key file for $AppVersionStrFull not found."
   fi
 
   while IFS='' read -r line || [[ -n "$line" ]]; do
-    BetaSignature="$line"
-  done < "$BetaFilePath"
+    AlphaSignature="$line"
+  done < "$AlphaFilePath"
 
-  MacUpdateFile="${MacUpdateFile}_${BetaSignature}"
-  MacSetupFile="tbeta${BetaVersion}_${BetaSignature}.zip"
-  Mac32UpdateFile="${Mac32UpdateFile}_${BetaSignature}"
-  Mac32SetupFile="tbeta${BetaVersion}_${BetaSignature}.zip"
-  WinUpdateFile="${WinUpdateFile}_${BetaSignature}"
-  WinPortableFile="tbeta${BetaVersion}_${BetaSignature}.zip"
-  LinuxUpdateFile="${LinuxUpdateFile}_${BetaSignature}"
-  LinuxSetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz"
-  Linux32UpdateFile="${Linux32UpdateFile}_${BetaSignature}"
-  Linux32SetupFile="tbeta${BetaVersion}_${BetaSignature}.tar.xz"
+  MacUpdateFile="${MacUpdateFile}_${AlphaSignature}"
+  MacSetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
+  Mac32UpdateFile="${Mac32UpdateFile}_${AlphaSignature}"
+  Mac32SetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
+  WinUpdateFile="${WinUpdateFile}_${AlphaSignature}"
+  WinPortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
+  LinuxUpdateFile="${LinuxUpdateFile}_${AlphaSignature}"
+  LinuxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
+  Linux32UpdateFile="${Linux32UpdateFile}_${AlphaSignature}"
+  Linux32SetupFile="talpha${AlphaVersion}_${AlphaSignature}.tar.xz"
 fi
 
 if [ "$DeployMac" == "1" ]; then
@@ -160,7 +160,7 @@ if [ "$DeployWin" == "1" ]; then
   if [ ! -f "$WinDeployPath/$WinUpdateFile" ]; then
     Error "$WinUpdateFile not found!"
   fi
-  if [ "$BetaVersion" == "0" ]; then
+  if [ "$AlphaVersion" == "0" ]; then
     if [ ! -f "$WinDeployPath/$WinSetupFile" ]; then
       Error "$WinSetupFile not found!"
     fi
@@ -197,7 +197,7 @@ if [ "$DeployMac32" == "1" ]; then
 fi
 if [ "$DeployWin" == "1" ]; then
   Files+=("tsetup/$WinUpdateFile" "tsetup/$WinPortableFile")
-  if [ "$BetaVersion" == "0" ]; then
+  if [ "$AlphaVersion" == "0" ]; then
     Files+=("tsetup/$WinSetupFile")
   fi
 fi

Telegram/build/release.py

@@ -59,8 +59,7 @@ url = 'https://api.github.com/'
 version_parts = version.split('.')
 
 stable = 1
-alpha = 0
-dev = 0
+beta = 0
 
 if len(version_parts) < 2:
   print('Error: expected at least major version ' + version)
@@ -76,14 +75,10 @@ else:
   version = version_major + '.' + version_parts[2]
   version_full = version
   if len(version_parts) == 4:
-    if version_parts[3] == 'dev':
-      dev = 1
+    if version_parts[3] == 'beta':
+      beta = 1
       stable = 0
-      version_full = version + '.dev'
-    elif version_parts[3] == 'alpha':
-      alpha = 1
-      stable = 0
-      version_full = version + '.alpha'
+      version_full = version + '.beta'
     else:
       print('Error: unexpected version part ' + version_parts[3])
       sys.exit(1)
@@ -102,16 +97,11 @@ print('Version: ' + version_full);
 local_folder = expanduser("~") + '/Telegram/backup/' + version_major + '/' + version_full
 
 if stable == 1:
-  if os.path.isdir(local_folder + '.dev'):
-    dev = 1
+  if os.path.isdir(local_folder + '.beta'):
+    beta = 1
     stable = 0
-    version_full = version + '.dev'
-    local_folder = local_folder + '.dev'
-  elif os.path.isdir(local_folder + '.alpha'):
-    alpha = 1
-    stable = 0
-    version_full = version + '.alpha'
-    local_folder = local_folder + '.alpha'
+    version_full = version + '.beta'
+    local_folder = local_folder + '.beta'
 
 if not os.path.isdir(local_folder):
   print('Storage path not found: ' + local_folder)
@@ -200,7 +190,7 @@ if r.status_code == 404:
     'target_commitish': commit,
     'name': 'v ' + version,
     'body': changelog,
-    'prerelease': (dev == 1 or alpha == 1),
+    'prerelease': (beta == 1),
   }))
   checkResponseCode(r, 201)
 

Telegram/build/release.sh

@@ -30,14 +30,14 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
 done < "$FullScriptPath/version"
 
 VersionForPacker="$AppVersion"
-if [ "$BetaVersion" != "0" ]; then
-  Error "No releases for closed beta versions"
-elif [ "$AlphaChannel" == "0" ]; then
+if [ "$AlphaVersion" != "0" ]; then
+  Error "No releases for closed alpha versions"
+elif [ "$BetaChannel" == "0" ]; then
   AppVersionStrFull="$AppVersionStr"
   AlphaBetaParam=''
 else
-  AppVersionStrFull="$AppVersionStr.alpha"
-  AlphaBetaParam='-alpha'
+  AppVersionStrFull="$AppVersionStr.beta"
+  AlphaBetaParam='-beta'
 fi
 
 cd "$FullScriptPath"

Telegram/build/set_version.bat

@@ -9,14 +9,14 @@ for /F "tokens=1,2,3,4 delims=. " %%a in ("%InputVersion%") do (
   set "VersionMinor=%%b"
   set "VersionPatch=%%c"
   if "%%d" == "" (
-    set "VersionBeta=0"
     set "VersionAlpha=0"
-  ) else if "%%d" == "alpha" (
     set "VersionBeta=0"
-    set "VersionAlpha=1"
+  ) else if "%%d" == "beta" (
+    set "VersionAlpha=0"
+    set "VersionBeta=1"
   ) else (
-    set "VersionBeta=%%d"
-    set "VersionAlpha=0"
+    set "VersionAlpha=%%d"
+    set "VersionBeta=0"
   )
 )
 
@@ -35,27 +35,27 @@ if "%VersionPatchCleared%" neq "%VersionPatch%" (
   echo Bad patch version!
   exit /b 1
 )
-if "%VersionAlpha%" neq "0" (
-  if "%VersionAlpha%" neq "1" (
-    echo Bad alpha version!
-    exit /b 1
-  )
-  set "VersionAlphaBool=true"
-) else (
-  set "VersionAlphaBool=false"
-)
-
-set /a "VersionFull=%VersionMajor% * 1000000 + %VersionMinor% * 1000 + %VersionPatch%"
 if "%VersionBeta%" neq "0" (
-  set /a "VersionBetaCleared=%VersionBeta% %% 1000"
-  if "!VersionBetaCleared!" neq "%VersionBeta%" (
+  if "%VersionBeta%" neq "1" (
     echo Bad beta version!
     exit /b 1
   )
-  set /a "VersionBetaMul=1000 + %VersionBeta%"
-  set "VersionFullBeta=%VersionFull%!VersionBetaMul:~1!"
+  set "VersionBetaBool=true"
 ) else (
-  set "VersionFullBeta=0"
+  set "VersionBetaBool=false"
+)
+
+set /a "VersionFull=%VersionMajor% * 1000000 + %VersionMinor% * 1000 + %VersionPatch%"
+if "%VersionAlpha%" neq "0" (
+  set /a "VersionAlphaCleared=%VersionAlpha% %% 1000"
+  if "!VersionAlphaCleared!" neq "%VersionAlpha%" (
+    echo Bad alpha version!
+    exit /b 1
+  )
+  set /a "VersionAlphaMul=1000 + %VersionAlpha%"
+  set "VersionFullAlpha=%VersionFull%!VersionAlphaMul:~1!"
+) else (
+  set "VersionFullAlpha=0"
 )
 
 set "VersionStr=%VersionMajor%.%VersionMinor%.%VersionPatch%"
@@ -65,10 +65,10 @@ if "%VersionPatch%" neq "0" (
   set "VersionStrSmall=%VersionMajor%.%VersionMinor%"
 )
 
-if "%VersionAlpha%" neq "0" (
-  echo Setting version: %VersionStr% alpha
-) else if "%VersionBeta%" neq "0" (
-  echo Setting version: %VersionStr%.%VersionBeta% closed beta
+if "%VersionBeta%" neq "0" (
+  echo Setting version: %VersionStr% beta
+) else if "%VersionAlpha%" neq "0" (
+  echo Setting version: %VersionStr%.%VersionAlpha% closed alpha
 ) else (
   echo Setting version: %VersionStr% stable
 )
@@ -96,33 +96,33 @@ call :repl "Argument=(AppVersion) (\s*)\d+/$1$2 %VersionFull%" "Filename=%Versio
 call :repl "Argument=(AppVersionStrMajor) (\s*)[\d\.]+/$1$2 %VersionMajor%.%VersionMinor%" "Filename=%VersionFilePath%" || goto :error
 call :repl "Argument=(AppVersionStrSmall) (\s*)[\d\.]+/$1$2 %VersionStrSmall%" "Filename=%VersionFilePath%" || goto :error
 call :repl "Argument=(AppVersionStr) (\s*)[\d\.]+/$1$2 %VersionStr%" "Filename=%VersionFilePath%" || goto :error
-call :repl "Argument=(AlphaChannel) (\s*)[\d\.]+/$1$2 %VersionAlpha%" "Filename=%VersionFilePath%" || goto :error
-call :repl "Argument=(BetaVersion) (\s*)\d+/$1$2 %VersionFullBeta%" "Filename=%VersionFilePath%" || goto :error
+call :repl "Argument=(BetaChannel) (\s*)[\d\.]+/$1$2 %VersionBeta%" "Filename=%VersionFilePath%" || goto :error
+call :repl "Argument=(AlphaVersion) (\s*)\d+/$1$2 %VersionFullAlpha%" "Filename=%VersionFilePath%" || goto :error
 
 echo Patching core/version.h...
 set "VersionHeaderPath=%FullScriptPath%..\SourceFiles\core\version.h"
-call :repl "Argument=(BETA_VERSION_MACRO\s+)\(\d+ULL\)/$1(%VersionFullBeta%ULL)" "Filename=%VersionHeaderPath%" || goto :error
+call :repl "Argument=(ALPHA_VERSION_MACRO\s+)\(\d+ULL\)/$1(%VersionFullAlpha%ULL)" "Filename=%VersionHeaderPath%" || goto :error
 call :repl "Argument=(AppVersion\s+=) (\s*)\d+/$1$2 %VersionFull%" "Filename=%VersionHeaderPath%" || goto :error
 call :repl "Argument=(AppVersionStr\s+=) (\s*)[&hat;;]+/$1$2 "%VersionStrSmall%"" "Filename=%VersionHeaderPath%" || goto :error
-call :repl "Argument=(AppAlphaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionAlphaBool%" "Filename=%VersionHeaderPath%" || goto :error
+call :repl "Argument=(AppBetaVersion\s+=) (\s*)[a-z]+/$1$2 %VersionBetaBool%" "Filename=%VersionHeaderPath%" || goto :error
 
 echo Patching Telegram.rc...
 set "ResourcePath=%FullScriptPath%..\Resources\winrc\Telegram.rc"
-call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error
-call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error
-call :repl "Argument=("FileVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%"" "Filename=%ResourcePath%" || goto :error
-call :repl "Argument=("ProductVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%"" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=("FileVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%"" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=("ProductVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%"" "Filename=%ResourcePath%" || goto :error
 
 echo Patching Updater.rc...
 set "ResourcePath=%FullScriptPath%..\Resources\winrc\Updater.rc"
-call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error
-call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionBeta%" "Filename=%ResourcePath%" || goto :error
-call :repl "Argument=("FileVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%"" "Filename=%ResourcePath%" || goto :error
-call :repl "Argument=("ProductVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%"" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=(FILEVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=(PRODUCTVERSION) (\s*)\d+,\d+,\d+,\d+/$1$2 %VersionMajor%,%VersionMinor%,%VersionPatch%,%VersionAlpha%" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=("FileVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%"" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument=("ProductVersion",) (\s*)"\d+.\d+.\d+.\d+"/$1$2 "%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%"" "Filename=%ResourcePath%" || goto :error
 
 echo Patching appxmanifest.xml...
 set "ResourcePath=%FullScriptPath%..\Resources\uwp\AppX\AppxManifest.xml"
-call :repl "Argument= (Version=)"\d+.\d+.\d+.\d+"/ $1"%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionBeta%"" "Filename=%ResourcePath%" || goto :error
+call :repl "Argument= (Version=)"\d+.\d+.\d+.\d+"/ $1"%VersionMajor%.%VersionMinor%.%VersionPatch%.%VersionAlpha%"" "Filename=%ResourcePath%" || goto :error
 
 exit /b
 

Telegram/build/set_version.sh

@@ -15,14 +15,14 @@ VersionMajor="${VersionParts[0]}"
 VersionMinor="${VersionParts[1]}"
 VersionPatch="${VersionParts[2]}"
 if [ "${VersionParts[3]}" == "" ]; then
-  VersionBeta=0
   VersionAlpha=0
-elif [ "${VersionParts[3]}" == "alpha" ]; then
   VersionBeta=0
-  VersionAlpha=1
+elif [ "${VersionParts[3]}" == "beta" ]; then
+  VersionAlpha=0
+  VersionBeta=1
 else
-  VersionBeta="${VersionParts[3]}"
-  VersionAlpha=0
+  VersionAlpha="${VersionParts[3]}"
+  VersionBeta=0
 fi
 
 VersionMajorCleared=`echo "$VersionMajor % 1000" | bc`
@@ -37,25 +37,25 @@ VersionPatchCleared=`echo "$VersionPatch % 1000" | bc`
 if [ "$VersionPatchCleared" != "$VersionPatch" ]; then
   Error "Bad patch version!"
 fi
-if [ "$VersionAlpha" != "0" ]; then
-  if [ "$VersionAlpha" != "1" ]; then
-    Error "Bad alpha version!"
+if [ "$VersionBeta" != "0" ]; then
+  if [ "$VersionBeta" != "1" ]; then
+    Error "Bad beta version!"
   fi
-  VersionAlphaBool=true
+  VersionBetaBool=true
 else
-  VersionAlphaBool=false
+  VersionBetaBool=false
 fi
 
 VersionFull=`echo "$VersionMajor * 1000000 + $VersionMinor * 1000 + $VersionPatch" | bc`
-if [ "$VersionBeta" != "0" ]; then
-  VersionBetaCleared=`echo "$VersionBeta % 1000" | bc`
-  if [ "$VersionBetaCleared" != "$VersionBeta" ]; then
-    Error "Bad beta version!"
+if [ "$VersionAlpha" != "0" ]; then
+  VersionAlphaCleared=`echo "$VersionAlpha % 1000" | bc`
+  if [ "$VersionAlphaCleared" != "$VersionAlpha" ]; then
+    Error "Bad alpha version!"
   fi
-  VersionBetaMul=`echo "$VersionBeta + 1000" | bc`
-  VersionFullBeta="$VersionFull${VersionBetaMul:1}"
+  VersionAlphaMul=`echo "$VersionAlpha + 1000" | bc`
+  VersionFullAlpha="$VersionFull${VersionAlphaMul:1}"
 else
-  VersionFullBeta=0
+  VersionFullAlpha=0
 fi
 
 VersionStr="$VersionMajor.$VersionMinor.$VersionPatch"
@@ -65,10 +65,10 @@ else
   VersionStrSmall="$VersionMajor.$VersionMinor"
 fi
 
-if [ "$VersionAlpha" != "0" ]; then
-  echo "Setting version: $VersionStr alpha"
-elif [ "$VersionBeta" != "0" ]; then
-  echo "Setting version: $VersionStr.$VersionBeta closed beta"
+if [ "$VersionBeta" != "0" ]; then
+  echo "Setting version: $VersionStr beta"
+elif [ "$VersionAlpha" != "0" ]; then
+  echo "Setting version: $VersionStr.$VersionAlpha closed alpha"
 else
   echo "Setting version: $VersionStr stable"
 fi
@@ -116,30 +116,30 @@ repl "\(AppVersion\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFull" "$VersionFilePath"
 repl "\(AppVersionStrMajor\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionMajor.$VersionMinor" "$VersionFilePath"
 repl "\(AppVersionStrSmall\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionStrSmall" "$VersionFilePath"
 repl "\(AppVersionStr\) \([ ]*\)[0-9][0-9\.]*" "\1\2 $VersionStr" "$VersionFilePath"
-repl "\(AlphaChannel\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionAlpha" "$VersionFilePath"
-repl "\(BetaVersion\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFullBeta" "$VersionFilePath"
+repl "\(BetaChannel\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionBeta" "$VersionFilePath"
+repl "\(AlphaVersion\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFullAlpha" "$VersionFilePath"
 
 echo "Patching core/version.h..."
 VersionHeaderPath="$FullScriptPath/../SourceFiles/core/version.h"
-repl "\(BETA_VERSION_MACRO [ ]*\)([0-9][0-9]*ULL)" "\1(${VersionFullBeta}ULL)" "$VersionHeaderPath"
+repl "\(ALPHA_VERSION_MACRO [ ]*\)([0-9][0-9]*ULL)" "\1(${VersionFullAlpha}ULL)" "$VersionHeaderPath"
 repl "\(AppVersion [ ]*=\) \([ ]*\)[0-9][0-9]*" "\1\2 $VersionFull" "$VersionHeaderPath"
 repl "\(AppVersionStr [ ]*=\) \([ ]*\)[^;][^;]*" "\1\2 \"$VersionStrSmall\"" "$VersionHeaderPath"
-repl "\(AppAlphaVersion [ ]*=\) \([ ]*\)[a-z][a-z]*" "\1\2 $VersionAlphaBool" "$VersionHeaderPath"
+repl "\(AppBetaVersion [ ]*=\) \([ ]*\)[a-z][a-z]*" "\1\2 $VersionBetaBool" "$VersionHeaderPath"
 
 echo "Patching Telegram.rc..."
 ResourcePath="$FullScriptPath/../Resources/winrc/Telegram.rc"
-repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath"
-repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath"
-repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath"
-repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath"
+repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
+repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
+repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
+repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
 
 echo "Patching Updater.rc..."
 ResourcePath="$FullScriptPath/../Resources/winrc/Updater.rc"
-repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath"
-repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionBeta" "$ResourcePath"
-repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath"
-repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath"
+repl "\(FILEVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
+repl "\(PRODUCTVERSION\) \([ ]*\)[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*,[0-9][0-9]*" "\1\2 $VersionMajor,$VersionMinor,$VersionPatch,$VersionAlpha" "$ResourcePath"
+repl "\(\"FileVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
+repl "\(\"ProductVersion\",\) \([ ]*\)\"[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\"" "\1\2 \"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"
 
 echo "Patching appxmanifest.xml..."
 ResourcePath="$FullScriptPath/../Resources/uwp/AppX/AppxManifest.xml"
-repl " \(Version=\)\"[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*\"" " \1\"$VersionMajor.$VersionMinor.$VersionPatch.$VersionBeta\"" "$ResourcePath"
+repl " \(Version=\)\"[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*\"" " \1\"$VersionMajor.$VersionMinor.$VersionPatch.$VersionAlpha\"" "$ResourcePath"

Telegram/build/version

@@ -2,5 +2,5 @@ AppVersion         1003016
 AppVersionStrMajor 1.3
 AppVersionStrSmall 1.3.16
 AppVersionStr      1.3.16
-AlphaChannel       0
-BetaVersion        1003016007
+BetaChannel        0
+AlphaVersion       1003016007