Skip to content
Snippets Groups Projects
Commit 67a7efae authored by Ming Rui Zhang's avatar Ming Rui Zhang
Browse files

chatview: use recipient's name in the send message input placeholder

for LRC issue:
Gitlab: #443

Change-Id: I761901acc2dfca698cbb3bb4776924b58b0724da
parent 0d5361fc
Branches
Tags
No related merge requests found
...@@ -71,15 +71,16 @@ MessagesAdapter::setupChatView(const QString& convUid) ...@@ -71,15 +71,16 @@ MessagesAdapter::setupChatView(const QString& convUid)
auto selectedAccountId = LRCInstance::getCurrAccId(); auto selectedAccountId = LRCInstance::getCurrAccId();
auto& accountInfo = LRCInstance::accountModel().getAccountInfo(selectedAccountId); auto& accountInfo = LRCInstance::accountModel().getAccountInfo(selectedAccountId);
lrc::api::profile::Type contactType = lrc::api::profile::Type::INVALID; lrc::api::contact::Info contactInfo;
try { try {
auto contactInfo = accountInfo.contactModel->getContact(contactURI); contactInfo = accountInfo.contactModel->getContact(contactURI);
contactType = contactInfo.profileInfo.type;
} catch (...) { } catch (...) {
} }
bool shouldShowSendContactRequestBtn = (contactType == lrc::api::profile::Type::PENDING bool shouldShowSendContactRequestBtn = (contactInfo.profileInfo.type
|| contactType == lrc::api::profile::Type::TEMPORARY); == lrc::api::profile::Type::PENDING
|| contactInfo.profileInfo.type
== lrc::api::profile::Type::TEMPORARY);
QMetaObject::invokeMethod(qmlObj_, QMetaObject::invokeMethod(qmlObj_,
"setSendContactRequestButtonVisible", "setSendContactRequestButtonVisible",
...@@ -111,6 +112,10 @@ MessagesAdapter::setupChatView(const QString& convUid) ...@@ -111,6 +112,10 @@ MessagesAdapter::setupChatView(const QString& convUid)
requestSendMessageContent(); requestSendMessageContent();
currentConvUid_ = convUid; 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 void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment