From f0a03223e8753ce550bd53dab8ddb0797eb9582a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 7 Dec 2017 12:56:10 +0400 Subject: [PATCH] Share contact instantly to Saved Messages. --- .../SourceFiles/history/history_widget.cpp | 24 +++++++++++++++---- .../SourceFiles/window/window_peer_menu.cpp | 6 +++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 833ad1b37..dde26c33f 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -4229,15 +4229,29 @@ bool HistoryWidget::confirmSendingFiles(const QMimeData *data, CompressConfirm c return false; } -bool HistoryWidget::confirmShareContact(const QString &phone, const QString &fname, const QString &lname, const QString *addedComment) { +bool HistoryWidget::confirmShareContact( + const QString &phone, + const QString &fname, + const QString &lname, + const QString *addedComment) { if (!canWriteMessage()) return false; auto box = Box(phone, fname, lname); - auto sendCallback = [this, phone, fname, lname](const QStringList &files, const QImage &image, std::unique_ptr information, bool compressed, const QString &caption, MsgId replyTo) { + auto sendCallback = [=]( + const QStringList &files, + const QImage &image, + std::unique_ptr information, + bool compressed, + const QString &caption, + MsgId replyTo) { shareContact(_peer->id, phone, fname, lname, replyTo); }; auto insertTextOnCancel = QString(); - return showSendFilesBox(std::move(box), insertTextOnCancel, addedComment, std::move(sendCallback)); + return showSendFilesBox( + std::move(box), + insertTextOnCancel, + addedComment, + std::move(sendCallback)); } HistoryWidget::SendingFilesLists HistoryWidget::getSendingFilesLists(const QList &files) { @@ -5830,7 +5844,9 @@ void HistoryWidget::onCopyPostLink() { bool HistoryWidget::lastForceReplyReplied(const FullMsgId &replyTo) const { if (replyTo.msg > 0 && replyTo.channel != _channel) return false; - return _keyboard->forceReply() && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) && _keyboard->forMsgId().msg == (replyTo.msg < 0 ? replyToId() : replyTo.msg); + return _keyboard->forceReply() + && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) + && _keyboard->forMsgId().msg == (replyTo.msg < 0 ? replyToId() : replyTo.msg); } bool HistoryWidget::cancelReply(bool lastKeyboardUsed) { diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 8368170c6..6c25c7d1e 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -425,6 +425,12 @@ void PeerMenuShareContactBox(not_null user) { lang(lng_forward_share_cant)), LayerOption::KeepOther); return; + } else if (peer->isSelf()) { + App::main()->onShareContact( + peer->id, + user); + Ui::Toast::Show(lang(lng_share_done)); + return; } auto recipient = peer->isUser() ? peer->name