diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp index cbbe38518e..b45708b844 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp @@ -150,8 +150,7 @@ void MessageView::prepare( not_null item, Data::Forum *forum, Fn customEmojiRepaint, - ToPreviewOptions options, - Fn customLoadingFinishCallback) { + ToPreviewOptions options) { if (!forum) { _topics = nullptr; } else if (!_topics || _topics->forum() != forum) { @@ -213,11 +212,9 @@ void MessageView::prepare( if (!_loadingContext) { _loadingContext = std::make_unique(); item->history()->session().downloaderTaskFinished( - ) | rpl::start_with_next( - customLoadingFinishCallback - ? customLoadingFinishCallback - : Fn([=] { _textCachedFor = nullptr; }), - _loadingContext->lifetime); + ) | rpl::start_with_next([=] { + _textCachedFor = nullptr; + }, _loadingContext->lifetime); } _loadingContext->context = std::move(preview.loadingContext); } else { diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h index 9fa6571c90..4ee12aebd3 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.h @@ -61,8 +61,7 @@ public: not_null item, Data::Forum *forum, Fn customEmojiRepaint, - ToPreviewOptions options, - Fn customLoadingFinishCallback = nullptr); + ToPreviewOptions options); void paint( Painter &p, diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index 5f1f66b780..b9a94d3bdf 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -1698,18 +1698,10 @@ object_ptr DetailsFiller::setupPersonalChannel( auto &lifetime = preview->lifetime(); using namespace Dialogs::Ui; const auto previewView = lifetime.make_state(); + const auto previewUpdate = [=] { preview->update(); }; preview->resize(0, st::infoLabeled.style.font->height); - const auto prepare = [previewView, preview]( - not_null item) { - previewView->prepare( - item, - nullptr, - [=] { preview->update(); }, - {}, - []{}); - }; if (!previewView->dependsOn(item)) { - prepare(item); + previewView->prepare(item, nullptr, previewUpdate, {}); } preview->paintRequest( ) | rpl::start_with_next([=, fullId = item->fullId()]( @@ -1739,7 +1731,7 @@ object_ptr DetailsFiller::setupPersonalChannel( preview->rect(), tr::lng_contacts_loading(tr::now), style::al_left); - prepare(item); + previewView->prepare(item, nullptr, previewUpdate, {}); preview->update(); } }, preview->lifetime());