diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index c2efb245d..52c4e800f 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.6.7.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 673350f43..138c64c9f 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,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,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.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 69b92b906..7fda8282e 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,6,6,0 - PRODUCTVERSION 2,6,6,0 + FILEVERSION 2,6,7,0 + PRODUCTVERSION 2,6,7,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.6.6.0" + VALUE "FileVersion", "2.6.7.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.6.6.0" + VALUE "ProductVersion", "2.6.7.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp index 170e4beea..9c3dc61b4 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/calls_group_members.cpp @@ -1597,7 +1597,11 @@ base::unique_qptr MembersController::createRowContextMenu( } } else { result->addAction( - tr::lng_context_view_profile(tr::now), + (participantPeer->isUser() + ? tr::lng_context_view_profile(tr::now) + : participantPeer->isBroadcast() + ? tr::lng_context_view_channel(tr::now) + : tr::lng_context_view_group(tr::now)), showProfile); if (participantPeer->isUser()) { result->addAction( diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index e8812be7e..67fe5f1ae 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -137,6 +137,10 @@ std::map BetaLogs() { 2006005, "- Improvements and fixes in new voice chat features.\n" }, + { + 2006007, + "- Improve voice chat participants list updating.\n" + }, }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 6538e7c37..da9af7fe4 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 = 2006006; -constexpr auto AppVersionStr = "2.6.6"; +constexpr auto AppVersion = 2006007; +constexpr auto AppVersionStr = "2.6.7"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp index 64f08a979..f3bc462d4 100644 --- a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp +++ b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp @@ -535,7 +535,10 @@ void ValidateSlice( ).arg(from ).arg(index ).arg(till) + strings.join(",")); - Unexpected("Bad slice in GroupThumbs."); + if (Logs::DebugEnabled()) { + Unexpected("Bad slice in GroupThumbs."); + } + break; } else { keys.emplace(key); } @@ -555,9 +558,7 @@ void GroupThumbs::fillItems( const auto current = (index - from); const auto old = base::take(_items); - if (Logs::DebugEnabled()) { - ValidateSlice(slice, _context, from, index, till); - } + ValidateSlice(slice, _context, from, index, till); markCacheStale(); _items.reserve(till - from); diff --git a/Telegram/build/version b/Telegram/build/version index 9f6a151f0..4333852bb 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2006006 +AppVersion 2006007 AppVersionStrMajor 2.6 -AppVersionStrSmall 2.6.6 -AppVersionStr 2.6.6 +AppVersionStrSmall 2.6.7 +AppVersionStr 2.6.7 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 2.6.6.beta +AppVersionOriginal 2.6.7.beta diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index 60d5c43da..01258d99f 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit 60d5c43daf882a6c03944a3e6198b5f35b654a0e +Subproject commit 01258d99f0ed3efa3f1f030c4077796bd30696f3 diff --git a/changelog.txt b/changelog.txt index 7ba62fbe0..dc81add05 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.6.7 beta (18.03.21) + +- Improve voice chat participants list updating. + 2.6.6 beta (18.03.21) - Fix joining popular voice chats.