Skip to content
Snippets Groups Projects
Commit f74a00cb authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

smartlist: use title() to avoid to depends on contact

Change-Id: I18e50cc29ce4183a1d3c89f1e30f9ddb61248278
parent 64398328
No related branches found
No related tags found
No related merge requests found
......@@ -409,7 +409,7 @@ ConversationsAdapter::getConvInfoMap(const QString& convId)
// titles should come from conversation, not contact model
return {{"convId", convId},
{"bestId", contactModel->bestIdForContact(peerUri)},
{"bestName", contactModel->bestNameForContact(peerUri)},
{"title", lrcInstance_->getCurrentConversationModel()->title(convId)},
{"uri", peerUri},
{"isSwarm", !convInfo.isNotASwarm()},
{"contactType", static_cast<int>(contact.profileInfo.type)},
......
......@@ -179,7 +179,7 @@ Rectangle {
var item = ConversationsAdapter.getConvInfoMap(convId)
if (item.convId === undefined)
return
communicationPageMessageWebView.headerUserAliasLabelText = item.bestName
communicationPageMessageWebView.headerUserAliasLabelText = item.title
communicationPageMessageWebView.headerUserUserNameLabelText = item.bestId
if (item.callStackViewShouldShow) {
if (inSettingsView) {
......
......@@ -131,7 +131,7 @@ ListView {
var item = {
"convId": model.dataForRow(row, ConversationList.UID),
"displayId": model.dataForRow(row, ConversationList.BestId),
"displayName": model.dataForRow(row, ConversationList.BestName),
"displayName": model.dataForRow(row, ConversationList.Title),
"uri": model.dataForRow(row, ConversationList.URI),
"contactType": model.dataForRow(row, ConversationList.ContactType),
"isSwarm": model.dataForRow(row, ConversationList.IsSwarm),
......
......@@ -78,16 +78,6 @@ MessagesAdapter::setupChatView(const QString& convUid)
auto selectedAccountId = lrcInstance_->getCurrentAccountId();
auto& accountInfo = lrcInstance_->accountModel().getAccountInfo(selectedAccountId);
lrc::api::contact::Info contactInfo;
QString bestName;
try {
contactInfo = accountInfo.contactModel->getContact(contactURI);
bestName = accountInfo.contactModel->bestNameForContact(contactURI);
} catch (...) {
}
bool isPending = contactInfo.profileInfo.type == profile::Type::TEMPORARY;
QMetaObject::invokeMethod(qmlObj_,
"setSendContactRequestButtonVisible",
Q_ARG(QVariant, convInfo.isNotASwarm() && convInfo.isRequest));
......@@ -100,7 +90,7 @@ MessagesAdapter::setupChatView(const QString& convUid)
setMessagesVisibility(false);
setIsSwarm(!convInfo.isNotASwarm());
setInvitation(convInfo.isRequest or convInfo.needsSyncing,
bestName,
convModel->title(convInfo.uid),
contactURI,
!convInfo.isNotASwarm(),
convInfo.needsSyncing);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment