RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed display of archiving toasts on wrong window.

This commit is contained in:
23rd 2023-12-21 02:32:07 +03:00 committed by John Preston
parent 9201cf24f1
commit 01906c1161
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/history/view/history_view_contact_status.cpp
View File

@ -714,8 +714,9 @@ void ContactStatus::setupShareHandler(not_null<UserData*> user) {
void ContactStatus::setupUnarchiveHandler(not_null<PeerData*> peer) {
_inner->unarchiveClicks(
) | rpl::start_with_next([=] {
Window::ToggleHistoryArchived(peer->owner().history(peer), false);
) | rpl::start_with_next([=, show = _controller->uiShow()] {
using namespace Window;
ToggleHistoryArchived(show, peer->owner().history(peer), false);
peer->owner().notifySettings().resetToDefault(peer);
if (const auto settings = peer->settings()) {
const auto flags = PeerSetting::AutoArchived

11
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@ -652,8 +652,8 @@ void Filler::addToggleArchive() {
? tr::lng_archived_remove(tr::now)
: tr::lng_archived_add(tr::now);
};
const auto toggle = [=] {
ToggleHistoryArchived(history, !isArchived());
const auto toggle = [=, show = _controller->uiShow()] {
ToggleHistoryArchived(show, history, !isArchived());
};
const auto archiveAction = _addAction(
label(),
@ -2406,9 +2406,12 @@ void MenuAddMarkAsReadChatListAction(
&st::menuIconMarkRead);
}
void ToggleHistoryArchived(not_null<History*> history, bool archived) {
void ToggleHistoryArchived(
std::shared_ptr<ChatHelpers::Show> show,
not_null<History*> history,
bool archived) {
const auto callback = [=] {
Ui::Toast::Show(Ui::Toast::Config{
show->showToast(Ui::Toast::Config{
.text = { (archived
? tr::lng_archived_added(tr::now)
: tr::lng_archived_removed(tr::now)) },

5
Telegram/SourceFiles/window/window_peer_menu.h
View File

@ -116,7 +116,10 @@ void BlockSenderFromRepliesBox(
not_null<Window::SessionController*> controller,
FullMsgId id);
void ToggleHistoryArchived(not_null<History*> history, bool archived);
void ToggleHistoryArchived(
std::shared_ptr<ChatHelpers::Show> show,
not_null<History*> history,
bool archived);
Fn<void()> ClearHistoryHandler(
not_null<Window::SessionController*> controller,
not_null<PeerData*> peer);