From 6321d22fc9cc3a67b82097a8464b1bf0e8f6fbeb Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 1 Oct 2015 17:19:27 +0300 Subject: [PATCH] 0.9.3.dev version ready --- Telegram/SourceFiles/application.cpp | 4 ++-- Telegram/SourceFiles/config.h | 6 +++--- .../SourceFiles/mtproto/mtpConnection.cpp | 12 ++++++++++-- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5532 -> 5532 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version | 8 ++++---- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index ff95994070..7a8d81f7fe 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -680,8 +680,8 @@ void Application::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if (cDevVersion() && Local::oldMapVersion() < 8059) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Channels members and admins management added\n\xe2\x80\x94 Bug fixes and other minor improvements\n\nMore info about channels here:\nhttps://telegram.org/blog/channels");// .replace('@', qsl("@") + QChar(0x200D)); + if (cDevVersion() && Local::oldMapVersion() < 9003) { + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Dialogs and emoji render made much faster\n\xe2\x80\x94 Bug fixes and other minor improvements");// .replace('@', qsl("@") + QChar(0x200D)); } else if (Local::oldMapVersion() < 9000) { versionFeatures = lng_new_version_text(lt_link, qsl("https://telegram.org/blog/channels"));//lang(lng_new_version_text).trimmed(); } else { diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 84aa76f2ee..6cff306119 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 9002; -static const wchar_t *AppVersionStr = L"0.9.2"; -static const bool DevVersion = false; +static const int32 AppVersion = 9003; +static const wchar_t *AppVersionStr = L"0.9.3"; +static const bool DevVersion = true; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/mtproto/mtpConnection.cpp b/Telegram/SourceFiles/mtproto/mtpConnection.cpp index 58b0e77454..2e4a771144 100644 --- a/Telegram/SourceFiles/mtproto/mtpConnection.cpp +++ b/Telegram/SourceFiles/mtproto/mtpConnection.cpp @@ -2728,11 +2728,19 @@ int32 MTProtoConnectionPrivate::handleOneReceived(const mtpPrime *from, const mt } return 1; case mtpc_new_session_created: { - if (badTime) return 0; - const mtpPrime *start = from; MTPNewSession msg(from, end); const MTPDnew_session_created &data(msg.c_new_session_created()); + + if (badTime) { + if (requestsFixTimeSalt(QVector(1, data.vfirst_msg_id), serverTime, serverSalt)) { + badTime = false; + } else { + DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(data.vfirst_msg_id.v)); + return 0; + } + } + DEBUG_LOG(("Message Info: new server session created, unique_id %1, first_msg_id %2, server_salt %3").arg(data.vunique_id.v).arg(data.vfirst_msg_id.v).arg(data.vserver_salt.v)); sessionData->setSalt(data.vserver_salt.v); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 9fcd3542ea..003ad0fa12 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.2 + 0.9.3 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 379ade837d7289a0285ac6ac35675b91d5698644..f6fb8bf7a198c45dd3ae1b0fcd392be87d8712bf 100644 GIT binary patch delta 50 zcmbQEJx6;(0WYKR