From 388d743d29c48d95856596e8fec69018a8c0e832 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 14 Nov 2017 21:37:39 +0400 Subject: [PATCH] Add confirmation on leaving group/channel. --- Telegram/Resources/langs/lang.strings | 2 +- .../SourceFiles/info/media/info_media_inner_widget.cpp | 4 ++++ .../SourceFiles/info/profile/info_profile_actions.cpp | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index b9d82c96a..7ee2a8ae5 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -735,7 +735,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_sure_delete_and_exit" = "Are you sure, you want to delete all message history and leave «{group}»?\n\nThis action cannot be undone."; "lng_sure_leave_channel" = "Are you sure, you want to leave\nthis channel?"; "lng_sure_delete_channel" = "Are you sure, you want to delete this channel? All members will be removed and all messages will be lost."; -"lng_sure_leave_group" = "Are you sure, you want to leave\nthis group? This action cannot be undone."; +"lng_sure_leave_group" = "Are you sure, you want to leave\nthis group?"; "lng_sure_delete_group" = "Are you sure, you want to delete this group? All members will be removed and all messages will be lost."; "lng_message_empty" = "Empty Message"; diff --git a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp index c442d336d..3915dc265 100644 --- a/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_inner_widget.cpp @@ -44,6 +44,10 @@ InnerWidget::InnerWidget( : RpWidget(parent) , _controller(controller) , _empty(this) { + _empty->heightValue() + | rpl::start_with_next( + [this] { refreshHeight(); }, + _empty->lifetime()); _list = setupList(); setupOtherTypes(); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index 75201be6c..c11f3f5e6 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -556,11 +556,19 @@ void ActionsFiller::addBlockAction(not_null user) { void ActionsFiller::addLeaveChannelAction( not_null channel) { + auto callback = [=] { + auto text = lang(channel->isMegagroup() + ? lng_sure_leave_group + : lng_sure_leave_channel); + Ui::show(Box(text, lang(lng_box_leave), [=] { + Auth().api().leaveChannel(channel); + }), LayerOption::KeepOther); + }; AddActionButton( _wrap, Lang::Viewer(lng_profile_leave_channel), AmInChannelValue(channel), - [channel] { Auth().api().leaveChannel(channel); }); + std::move(callback)); } void ActionsFiller::addJoinChannelAction(