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

Fix crash in replies. 

Regression was introduced in b1df3c0ec4.
This commit is contained in:
John Preston 2019-04-30 12:04:42 +04:00
parent cf0d4a0559
commit 5c3f93eee1
3 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Telegram/SourceFiles/data/data_session.cpp
View File

@ -1210,11 +1210,6 @@ rpl::producer<not_null<HistoryItem*>> Session::animationPlayInlineRequest() cons
return _animationPlayInlineRequest.events();
}
void Session::notifyItemRemoved(not_null<const HistoryItem*> item) {
_itemRemoved.fire_copy(item);
groups().unregisterMessage(item);
}
rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved() const {
return _itemRemoved.events();
}
@ -1646,16 +1641,30 @@ void Session::processMessagesDeleted(
}
}
void Session::removeDependencyMessage(not_null<HistoryItem*> item) {
const auto i = _dependentMessages.find(item);
if (i == end(_dependentMessages)) {
return;
}
const auto items = std::move(i->second);
_dependentMessages.erase(i);
for (const auto dependent : items) {
dependent->dependencyItemRemoved(item);
}
}
void Session::destroyMessage(not_null<HistoryItem*> item) {
Expects(!item->isLogEntry() || !item->mainView());
const auto peerId = item->history()->peer->id;
if (!item->isLogEntry()) {
// All this must be done for all items manually in History::clear()!
item->eraseFromUnreadMentions();
if (IsServerMsgId(item->id)) {
if (const auto types = item->sharedMediaTypes()) {
session().storage().remove(Storage::SharedMediaRemoveOne(
item->history()->peer->id,
peerId,
types,
item->id));
}
@ -1664,7 +1673,12 @@ void Session::destroyMessage(not_null<HistoryItem*> item) {
}
item->history()->itemRemoved(item);
}
const auto list = messagesListForInsert(item->history()->channelId());
_itemRemoved.fire_copy(item);
groups().unregisterMessage(item);
removeDependencyMessage(item);
session().notifications().clearFromItem(item);
const auto list = messagesListForInsert(peerToChannel(peerId));
list->erase(item->id);
}
@ -1692,29 +1706,6 @@ HistoryItem *Session::message(FullMsgId itemId) const {
return message(itemId.channel, itemId.msg);
}
//void historyUnregItem(not_null<HistoryItem*> item) {
// const auto data = fetchMsgsData(item->channelId(), false);
// if (!data) return;
//
// const auto i = data->find(item->id);
// if (i != data->cend()) {
// if (i.value() == item) {
// data->erase(i);
// }
// }
// const auto j = ::dependentItems.find(item);
// if (j != ::dependentItems.cend()) {
// DependentItemsSet items;
// std::swap(items, j.value());
// ::dependentItems.erase(j);
//
// for_const (auto dependent, items) {
// dependent->dependencyItemRemoved(item);
// }
// }
// item->history()->session().notifications().clearFromItem(item);
//}
void Session::updateDependentMessages(not_null<HistoryItem*> item) {
const auto i = _dependentMessages.find(item);
if (i != end(_dependentMessages)) {

2
Telegram/SourceFiles/data/data_session.h
View File

@ -189,7 +189,6 @@ public:
void notifyHistoryUnloaded(not_null<const History*> history);
[[nodiscard]] rpl::producer<not_null<const History*>> historyUnloaded() const;
void notifyItemRemoved(not_null<const HistoryItem*> item);
[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
void notifyViewRemoved(not_null<const ViewElement*> view);
[[nodiscard]] rpl::producer<not_null<const ViewElement*>> viewRemoved() const;
@ -677,6 +676,7 @@ private:
not_null<Messages*> messagesListForInsert(ChannelId channelId);
HistoryItem *registerMessage(std::unique_ptr<HistoryItem> item);
void changeMessageId(ChannelId channel, MsgId wasId, MsgId nowId);
void removeDependencyMessage(not_null<HistoryItem*> item);
void photoApplyFields(
not_null<PhotoData*> photo,

4
Telegram/SourceFiles/history/history_item.cpp
View File

@ -736,9 +736,7 @@ void HistoryItem::drawInDialog(
p.restoreTextPalette();
}
HistoryItem::~HistoryItem() {
_history->owner().notifyItemRemoved(this);
}
HistoryItem::~HistoryItem() = default;
QDateTime ItemDateTime(not_null<const HistoryItem*> item) {
return ParseDateTime(item->date());