From 67a7efae0425e071792956509d3fe80a37e885b0 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 5 Feb 2021 17:18:57 -0500
Subject: [PATCH] chatview: use recipient's name in the send message input
placeholder
for LRC issue:
Gitlab: #443
Change-Id: I761901acc2dfca698cbb3bb4776924b58b0724da
---
src/messagesadapter.cpp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 84e59b32b..e3dc4e9ba 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -71,15 +71,16 @@ MessagesAdapter::setupChatView(const QString& convUid)
auto selectedAccountId = LRCInstance::getCurrAccId();
auto& accountInfo = LRCInstance::accountModel().getAccountInfo(selectedAccountId);
- lrc::api::profile::Type contactType = lrc::api::profile::Type::INVALID;
+ lrc::api::contact::Info contactInfo;
try {
- auto contactInfo = accountInfo.contactModel->getContact(contactURI);
- contactType = contactInfo.profileInfo.type;
+ contactInfo = accountInfo.contactModel->getContact(contactURI);
} catch (...) {
}
- bool shouldShowSendContactRequestBtn = (contactType == lrc::api::profile::Type::PENDING
- || contactType == lrc::api::profile::Type::TEMPORARY);
+ bool shouldShowSendContactRequestBtn = (contactInfo.profileInfo.type
+ == lrc::api::profile::Type::PENDING
+ || contactInfo.profileInfo.type
+ == lrc::api::profile::Type::TEMPORARY);
QMetaObject::invokeMethod(qmlObj_,
"setSendContactRequestButtonVisible",
@@ -111,6 +112,10 @@ MessagesAdapter::setupChatView(const QString& convUid)
requestSendMessageContent();
currentConvUid_ = convUid;
+
+ QString s = QString::fromLatin1("reset_message_bar_input(`%1`);")
+ .arg(accountInfo.contactModel->bestNameForContact(contactURI));
+ QMetaObject::invokeMethod(qmlObj_, "webViewRunJavaScript", Q_ARG(QVariant, s));
}
void
--
GitLab