From 410efc924bf8128c2a71c94dedf7e03286043fb7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 20 Nov 2019 17:23:39 +0300 Subject: [PATCH] Closed alpha version 1.9.1.2. --- 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/mtproto/connection.cpp | 8 ++++---- Telegram/build/version | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 3f378237a..7dd60cca9 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.9.1.2" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index f4e3a8506..47b76bfca 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,1,1 - PRODUCTVERSION 1,9,1,1 + FILEVERSION 1,9,1,2 + PRODUCTVERSION 1,9,1,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.9.1.1" + VALUE "FileVersion", "1.9.1.2" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.1.1" + VALUE "ProductVersion", "1.9.1.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 74f56f7ee..2a4243e08 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,1,1 - PRODUCTVERSION 1,9,1,1 + FILEVERSION 1,9,1,2 + PRODUCTVERSION 1,9,1,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.9.1.1" + VALUE "FileVersion", "1.9.1.2" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.1.1" + VALUE "ProductVersion", "1.9.1.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 84ba377de..e7ca94112 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#define TDESKTOP_REQUESTED_ALPHA_VERSION (1009001001ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (1009001002ULL) #ifdef TDESKTOP_OFFICIAL_TARGET #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp index 1aec169cd..3ea3f70a0 100644 --- a/Telegram/SourceFiles/mtproto/connection.cpp +++ b/Telegram/SourceFiles/mtproto/connection.cpp @@ -1315,7 +1315,6 @@ void ConnectionPrivate::handleReceived() { } const auto serverTime = int32(msgId >> 32); - const auto clientTime = base::unixtime::now(); const auto isReply = ((msgId & 0x03) == 1); if (!isReply && ((msgId & 0x03) != 3)) { LOG(("MTP Error: bad msg_id %1 in message received").arg(msgId)); @@ -1323,10 +1322,11 @@ void ConnectionPrivate::handleReceived() { return restart(); } - bool badTime = false; - if (serverTime > clientTime + 60 || serverTime + 300 < clientTime) { + const auto clientTime = base::unixtime::now(); + const auto badTime = (serverTime > clientTime + 60) + || (serverTime + 300 < clientTime); + if (badTime) { DEBUG_LOG(("MTP Info: bad server time from msg_id: %1, my time: %2").arg(serverTime).arg(clientTime)); - badTime = true; } bool wasConnected = (getState() == ConnectedState); diff --git a/Telegram/build/version b/Telegram/build/version index c77479b5c..97b2f3729 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.9 AppVersionStrSmall 1.9.1 AppVersionStr 1.9.1 BetaChannel 0 -AlphaVersion 1009001001 +AlphaVersion 1009001002