From 6b70cc342afc6cb9f6ef245f10c39ba634722d15 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 25 Feb 2017 20:15:30 +0300 Subject: [PATCH] Closed beta 1000014001: testing MTP changes. Destroying of the authorization keys disabled for now. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/SourceFiles/messenger.cpp | 3 ++- Telegram/build/version | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index cc7f05d0b..01aaa336f 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.14.1" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 43896f03a..64bc47dff 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,14,0 - PRODUCTVERSION 1,0,14,0 + FILEVERSION 1,0,14,1 + PRODUCTVERSION 1,0,14,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.0.14.0" + VALUE "FileVersion", "1.0.14.1" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.14.0" + VALUE "ProductVersion", "1.0.14.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index c8ab6a130..f7a4e0909 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,14,0 - PRODUCTVERSION 1,0,14,0 + FILEVERSION 1,0,14,1 + PRODUCTVERSION 1,0,14,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.0.14.0" + VALUE "FileVersion", "1.0.14.1" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.14.0" + VALUE "ProductVersion", "1.0.14.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index e6f69927a..f510b6c28 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/utils.h" -#define BETA_VERSION_MACRO (0ULL) +#define BETA_VERSION_MACRO (1000014001ULL) constexpr int AppVersion = 1000014; constexpr str_const AppVersionStr = "1.0.14"; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 1f5b3d5a5..6cfa5f454 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -318,7 +318,8 @@ void Messenger::destroyStaleAuthorizationKeys() { auto keys = _mtproto->getKeysForWrite(); for (auto &key : keys) { - if (key->type() == MTP::AuthKey::Type::ReadFromFile) { + // Disable this for now. + if (false && key->type() == MTP::AuthKey::Type::ReadFromFile) { _private->mtpKeysToDestroy = _mtproto->getKeysForWrite(); _mtproto.reset(); LOG(("MTP Info: destroying stale keys, count: %1").arg(_private->mtpKeysToDestroy.size())); diff --git a/Telegram/build/version b/Telegram/build/version index 177ad2e07..780f8d6bc 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.0 AppVersionStrSmall 1.0.14 AppVersionStr 1.0.14 AlphaChannel 0 -BetaVersion 0 +BetaVersion 1000014001