diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 915dbf61c..a20191a2b 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
+ Version="2.1.17.0" />
Telegram Desktop
Telegram FZ-LLC
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 98d5d1d2b..3863a0ba7 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,16,0
- PRODUCTVERSION 2,1,16,0
+ FILEVERSION 2,1,17,0
+ PRODUCTVERSION 2,1,17,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop"
- VALUE "FileVersion", "2.1.16.0"
+ VALUE "FileVersion", "2.1.17.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "2.1.16.0"
+ VALUE "ProductVersion", "2.1.17.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index a29102114..25630bcad 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,16,0
- PRODUCTVERSION 2,1,16,0
+ FILEVERSION 2,1,17,0
+ PRODUCTVERSION 2,1,17,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater"
- VALUE "FileVersion", "2.1.16.0"
+ VALUE "FileVersion", "2.1.17.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "2.1.16.0"
+ VALUE "ProductVersion", "2.1.17.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 23fcb6ac8..9480a59fe 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -23,36 +23,43 @@ std::map BetaLogs() {
return {
{
1009020,
- "\xE2\x80\xA2 Fix crash in shared links search.\n"
+ "- Fix crash in shared links search.\n"
- "\xE2\x80\xA2 Fix blurred thumbnails in albums with video files.\n"
+ "- Fix blurred thumbnails in albums with video files.\n"
- "\xE2\x80\xA2 Fix a possible crash in animated stickers rendering."
+ "- Fix a possible crash in animated stickers rendering."
},
{
1009022,
- "\xE2\x80\xA2 Organize chats into Chat Folders "
- "if you have too many chats.\n"
+ "- Organize chats into Chat Folders if you have too many chats.\n"
},
{
2000001,
- "\xE2\x80\xA2 Switch between folders using Ctrl+1, ..., Ctrl+8.\n"
+ "- Switch between folders using Ctrl+1, ..., Ctrl+8.\n"
- "\xE2\x80\xA2 Fix crash when a pinned in folder chat "
- "was added to archive.\n"
+ "- Fix crash when a pinned in folder chat was added to archive.\n"
- "\xE2\x80\xA2 Fix font issues in Linux version."
+ "- Fix font issues in Linux version."
},
{
2001008,
- "\xE2\x80\xA2 Add support for full group message history export.\n"
+ "- Add support for full group message history export.\n"
- "\xE2\x80\xA2 Allow export of a single chat message history "
- "in JSON format."
+ "- Allow export of a single chat message history in JSON format."
},
{
2001014,
- "\xE2\x80\xA2 Support for multiple accounts."
+ "- Support for multiple accounts."
+ },
+ {
+ 2001017,
+ "- Fix messages editing in a non-active account.\n"
+
+ "- Fix large animated emoji messages editing.\n"
+
+ "- Fix high definition GIF animations opening in media viewer.\n"
+
+ "- Multiple crash fixes."
}
};
};
@@ -161,10 +168,18 @@ void Changelogs::addBetaLog(int changeVersion, const char *changes) {
if (_oldVersion >= changeVersion) {
return;
}
+ const auto text = [&] {
+ static const auto simple = u"\n- "_q;
+ static const auto separator = QString::fromUtf8("\n\xE2\x80\xA2 ");
+ auto result = QString::fromUtf8(changes).trimmed();
+ if (result.startsWith(simple.midRef(1))) {
+ result = separator.midRef(1) + result.midRef(simple.size() - 1);
+ }
+ return result.replace(simple, separator);
+ }();
const auto version = FormatVersionDisplay(changeVersion);
- const auto text = qsl("New in version %1:\n\n").arg(version)
- + QString::fromUtf8(changes).trimmed();
- addLocalLog(text);
+ const auto log = qsl("New in version %1:\n\n").arg(version) + text;
+ addLocalLog(log);
}
} // namespace Core
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4afb70c7c..004790007 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
constexpr auto AppName = "Telegram Desktop"_cs;
constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2001016;
-constexpr auto AppVersionStr = "2.1.16";
+constexpr auto AppVersion = 2001017;
+constexpr auto AppVersionStr = "2.1.17";
constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 71f03d59c..9c3b3678c 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion 2001016
+AppVersion 2001017
AppVersionStrMajor 2.1
-AppVersionStrSmall 2.1.16
-AppVersionStr 2.1.16
+AppVersionStrSmall 2.1.17
+AppVersionStr 2.1.17
BetaChannel 1
AlphaVersion 0
-AppVersionOriginal 2.1.16.beta
+AppVersionOriginal 2.1.17.beta
diff --git a/changelog.txt b/changelog.txt
index 756f9b0f7..f09a71aae 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+2.1.17 beta (02.07.20)
+
+- Fix messages editing in a non-active account.
+- Fix large animated emoji messages editing.
+- Fix high definition GIF animations opening in media viewer.
+- Multiple crash fixes.
+
2.1.16 beta (01.07.20)
- Crash fix.