diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 6052a220a..cab2e488b 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.1.7.2" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 5a85d0b4f..db23d84fd 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,1,7,1 - PRODUCTVERSION 1,1,7,1 + FILEVERSION 1,1,7,2 + PRODUCTVERSION 1,1,7,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.1.7.1" + VALUE "FileVersion", "1.1.7.2" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.7.1" + VALUE "ProductVersion", "1.1.7.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 4f6008df7..120d2e945 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,1,7,1 - PRODUCTVERSION 1,1,7,1 + FILEVERSION 1,1,7,2 + PRODUCTVERSION 1,1,7,2 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.1.7.1" + VALUE "FileVersion", "1.1.7.2" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.7.1" + VALUE "ProductVersion", "1.1.7.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index aba213c8d..c5c1d43b6 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -689,11 +689,15 @@ namespace { auto mask = MTPDchannel::Flag::f_broadcast | MTPDchannel::Flag::f_verified | MTPDchannel::Flag::f_megagroup | MTPDchannel::Flag::f_democracy; cdata->flags = (cdata->flags & ~mask) | (d.vflags.v & mask); } else { - if (d.has_admin_rights() || cdata->hasAdminRights()) { - cdata->setAdminRights(d.has_admin_rights() ? d.vadmin_rights : MTP_channelAdminRights(MTP_flags(0))); + if (d.has_admin_rights()) { + cdata->setAdminRights(d.vadmin_rights); + } else if (cdata->hasAdminRights()) { + cdata->setAdminRights(MTP_channelAdminRights(MTP_flags(0))); } - if (d.has_banned_rights() || cdata->hasRestrictedRights()) { - cdata->setRestrictedRights(d.has_banned_rights() ? d.vbanned_rights : MTP_channelBannedRights(MTP_flags(0), MTP_int(0))); + if (d.has_banned_rights()) { + cdata->setRestrictedRights(d.vbanned_rights); + } else if (cdata->hasRestrictedRights()) { + cdata->setRestrictedRights(MTP_channelBannedRights(MTP_flags(0), MTP_int(0))); } cdata->inputChannel = MTP_inputChannel(d.vid, d.vaccess_hash); cdata->access = d.vaccess_hash.v; diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index 7dfdf7611..8f4b26c3b 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -534,7 +534,7 @@ void TabbedSelector::checkRestrictedPeer() { if (restricted) { if (!_restrictedLabel) { auto text = (_currentTabType == SelectorTab::Stickers) ? lang(lng_restricted_send_stickers) : - (_currentTabType == SelectorTab::Gifs) ? lang(lng_restricted_send_gifs) : false; + (_currentTabType == SelectorTab::Gifs) ? lang(lng_restricted_send_gifs) : QString(); _restrictedLabel.create(this, text, Ui::FlatLabel::InitType::Simple, st::stickersRestrictedLabel); _restrictedLabel->show(); _restrictedLabel->move((width() - _restrictedLabel->width()), (height() / 3 - _restrictedLabel->height() / 2)); diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 737ee3145..889095d2c 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 (1001007001ULL) +#define BETA_VERSION_MACRO (1001007002ULL) constexpr int AppVersion = 1001007; constexpr str_const AppVersionStr = "1.1.7"; diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp index 1af4ac03e..19e7d7bea 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp @@ -495,7 +495,7 @@ void BannedBoxSearchController::searchDone(mtpRequestId requestId, const MTPchan } } -AddParticipantBoxController::AddParticipantBoxController(gsl::not_null channel, Role role, AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback) : PeerListController(std::make_unique(channel, role, &_additional)) +AddParticipantBoxController::AddParticipantBoxController(gsl::not_null channel, Role role, AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback) : PeerListController(std::make_unique(channel, &_additional)) , _channel(channel) , _role(role) , _adminDoneCallback(std::move(adminDoneCallback)) @@ -826,8 +826,7 @@ bool AddParticipantBoxController::prependRow(gsl::not_null user) { } std::unique_ptr AddParticipantBoxController::createRow(gsl::not_null user) const { - auto row = std::make_unique(user); - return std::move(row); + return std::make_unique(user); } template @@ -898,9 +897,8 @@ void AddParticipantBoxController::HandleParticipant(const MTPChannelParticipant } } -AddParticipantBoxSearchController::AddParticipantBoxSearchController(gsl::not_null channel, Role role, gsl::not_null additional) +AddParticipantBoxSearchController::AddParticipantBoxSearchController(gsl::not_null channel, gsl::not_null additional) : _channel(channel) -, _role(role) , _additional(additional) { _timer.setCallback([this] { searchOnServer(); }); } diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.h b/Telegram/SourceFiles/profile/profile_channel_controllers.h index b29214e65..3bec06769 100644 --- a/Telegram/SourceFiles/profile/profile_channel_controllers.h +++ b/Telegram/SourceFiles/profile/profile_channel_controllers.h @@ -177,7 +177,7 @@ public: using Role = ParticipantsBoxController::Role; using Additional = ParticipantsBoxController::Additional; - AddParticipantBoxSearchController(gsl::not_null channel, Role role, gsl::not_null additional); + AddParticipantBoxSearchController(gsl::not_null channel, gsl::not_null additional); void searchQuery(const QString &query) override; bool isLoading() override; @@ -203,7 +203,6 @@ private: void requestGlobal(); gsl::not_null _channel; - Role _role = Role::Admins; gsl::not_null _additional; base::Timer _timer; diff --git a/Telegram/build/version b/Telegram/build/version index 41df19f42..f5fa4d93f 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.1 AppVersionStrSmall 1.1.7 AppVersionStr 1.1.7 AlphaChannel 0 -BetaVersion 1001007001 +BetaVersion 1001007002