From 42febdb2408b2d2969f6640ba1ba5335370ebc2c Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 30 Jun 2017 14:30:11 +0300 Subject: [PATCH] Fix alpha version changelog notification. We should call window->serviceNotification() because it checks for the service chat history being loaded before adding the message. The method in MainWidget was renamed to prevent bugs in the future. --- Telegram/SourceFiles/apiwrap.cpp | 2 +- Telegram/SourceFiles/mainwidget.cpp | 2 +- Telegram/SourceFiles/mainwidget.h | 2 +- Telegram/SourceFiles/mainwindow.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index b92ce46f8..9b47d895d 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -90,7 +90,7 @@ void ApiWrap::addLocalAlphaChangelogs(int oldAppVersion) { auto text = qsl("New in version %1:\n\n").arg(changeVersionString) + QString::fromUtf8(changes).trimmed(); auto textWithEntities = TextWithEntities { text }; textParseEntities(textWithEntities.text, TextParseLinks, &textWithEntities.entities); - App::main()->serviceNotification(textWithEntities, MTP_messageMediaEmpty(), unixtime()); + App::wnd()->serviceNotification(textWithEntities, MTP_messageMediaEmpty(), unixtime()); } }; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 056309a97..026831836 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2088,7 +2088,7 @@ void MainWidget::dialogsCancelled() { _history->activate(); } -void MainWidget::serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media, int32 date) { +void MainWidget::insertCheckedServiceNotification(const TextWithEntities &message, const MTPMessageMedia &media, int32 date) { auto flags = MTPDmessage::Flag::f_entities | MTPDmessage::Flag::f_from_id | MTPDmessage_ClientFlag::f_clientside_unread; QString sendingText, leftText = message.text; EntitiesInText sendingEntities, leftEntities = message.entities; diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index bef68aa61..c44376c0b 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -325,7 +325,7 @@ public: void checkLastUpdate(bool afterSleep); - void serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media, int32 date); + void insertCheckedServiceNotification(const TextWithEntities &message, const MTPMessageMedia &media, int32 date); void serviceHistoryDone(const MTPmessages_Messages &msgs); bool serviceHistoryFail(const RPCError &error); diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 1b4cd18f0..82148320a 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -276,7 +276,7 @@ void MainWindow::serviceNotification(const TextWithEntities &message, const MTPM return sendServiceHistoryRequest(); } - _main->serviceNotification(message, media, date); + _main->insertCheckedServiceNotification(message, media, date); } void MainWindow::showDelayedServiceMsgs() {