From 0b87db8b4531a19739db61fc28ad6a9687619737 Mon Sep 17 00:00:00 2001 From: udf Date: Wed, 26 Dec 2018 08:52:48 +0200 Subject: [PATCH] Ignore only empty drafts while sending with clear_draft (#5424) --- Telegram/SourceFiles/data/data_drafts.cpp | 6 +++--- Telegram/SourceFiles/history/history.cpp | 7 +++++-- Telegram/SourceFiles/history/history.h | 2 +- Telegram/ThirdParty/libtgvoip | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp index 2e29b86ed..e07742063 100644 --- a/Telegram/SourceFiles/data/data_drafts.cpp +++ b/Telegram/SourceFiles/data/data_drafts.cpp @@ -53,10 +53,10 @@ void applyPeerCloudDraft(PeerId peerId, const MTPDdraftMessage &draft) { ? TextUtilities::EntitiesFromMTP(draft.ventities.v) : EntitiesInText()) }; - if (history->skipCloudDraft(textWithTags.text, draft.vdate.v)) { + auto replyTo = draft.has_reply_to_msg_id() ? draft.vreply_to_msg_id.v : MsgId(0); + if (history->skipCloudDraft(textWithTags.text, replyTo, draft.vdate.v)) { return; } - auto replyTo = draft.has_reply_to_msg_id() ? draft.vreply_to_msg_id.v : MsgId(0); auto cloudDraft = std::make_unique( textWithTags, replyTo, @@ -80,7 +80,7 @@ void applyPeerCloudDraft(PeerId peerId, const MTPDdraftMessage &draft) { void clearPeerCloudDraft(PeerId peerId, TimeId date) { const auto history = App::history(peerId); - if (history->skipCloudDraft(QString(), date)) { + if (history->skipCloudDraft(QString(), MsgId(0), date)) { return; } diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index 79630b9a9..6b2648303 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -512,8 +512,11 @@ Data::Draft *History::createCloudDraft(const Data::Draft *fromDraft) { return cloudDraft(); } -bool History::skipCloudDraft(const QString &text, TimeId date) const { - if (date > 0 && date <= _lastSentDraftTime + kSkipCloudDraftsFor) { +bool History::skipCloudDraft(const QString &text, MsgId replyTo, TimeId date) const { + if (Data::draftStringIsEmpty(text) + && !replyTo + && date > 0 + && date <= _lastSentDraftTime + kSkipCloudDraftsFor) { return true; } else if (_lastSentDraftText && *_lastSentDraftText == text) { return true; diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h index 8b794eb31..3ea00137a 100644 --- a/Telegram/SourceFiles/history/history.h +++ b/Telegram/SourceFiles/history/history.h @@ -326,7 +326,7 @@ public: void createLocalDraftFromCloud(); void setCloudDraft(std::unique_ptr &&draft); Data::Draft *createCloudDraft(const Data::Draft *fromDraft); - bool skipCloudDraft(const QString &text, TimeId date) const; + bool skipCloudDraft(const QString &text, MsgId replyTo, TimeId date) const; void setSentDraftText(const QString &text); void clearSentDraftText(const QString &text); void setEditDraft(std::unique_ptr &&draft); diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index 78e584c44..fb0a2b0c9 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit 78e584c443b93ce2794bee75c7448d1b00f1edc9 +Subproject commit fb0a2b0c9b59b3b19f9bc3c8a6aaf126f96d688f