lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-23 00:03:55 +02:00
Code Activity

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

Browse source 
Change-Id: I18e50cc29ce4183a1d3c89f1e30f9ddb61248278
This commit is contained in:
Sébastien Blin 2021-06-02 16:52:18 -04:00 • committed by Andreas Traczyk
parent 6439832824
commit f74a00cbf1
4 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/conversationsadapter.cpp
View file

@ -409,7 +409,7 @@ ConversationsAdapter::getConvInfoMap(const QString& convId)
// titles should come from conversation, not contact model // titles should come from conversation, not contact model
return {{"convId", convId}, return {{"convId", convId},
{"bestId", contactModel->bestIdForContact(peerUri)}, {"bestId", contactModel->bestIdForContact(peerUri)},
{"bestName", contactModel->bestNameForContact(peerUri)}, {"title", lrcInstance_->getCurrentConversationModel()->title(convId)},
{"uri", peerUri}, {"uri", peerUri},
{"isSwarm", !convInfo.isNotASwarm()}, {"isSwarm", !convInfo.isNotASwarm()},
{"contactType", static_cast<int>(contact.profileInfo.type)}, {"contactType", static_cast<int>(contact.profileInfo.type)},

2
src/mainview/MainView.qml
View file

@ -179,7 +179,7 @@ Rectangle {
var item = ConversationsAdapter.getConvInfoMap(convId) var item = ConversationsAdapter.getConvInfoMap(convId)
if (item.convId === undefined) if (item.convId === undefined)
return return
communicationPageMessageWebView.headerUserAliasLabelText = item.bestName communicationPageMessageWebView.headerUserAliasLabelText = item.title
communicationPageMessageWebView.headerUserUserNameLabelText = item.bestId communicationPageMessageWebView.headerUserUserNameLabelText = item.bestId
if (item.callStackViewShouldShow) { if (item.callStackViewShouldShow) {
if (inSettingsView) { if (inSettingsView) {

2
src/mainview/components/ConversationListView.qml
View file

@ -131,7 +131,7 @@ ListView {
var item = { var item = {
"convId": model.dataForRow(row, ConversationList.UID), "convId": model.dataForRow(row, ConversationList.UID),
"displayId": model.dataForRow(row, ConversationList.BestId), "displayId": model.dataForRow(row, ConversationList.BestId),
"displayName": model.dataForRow(row, ConversationList.BestName), "displayName": model.dataForRow(row, ConversationList.Title),
"uri": model.dataForRow(row, ConversationList.URI), "uri": model.dataForRow(row, ConversationList.URI),
"contactType": model.dataForRow(row, ConversationList.ContactType), "contactType": model.dataForRow(row, ConversationList.ContactType),
"isSwarm": model.dataForRow(row, ConversationList.IsSwarm), "isSwarm": model.dataForRow(row, ConversationList.IsSwarm),

12
src/messagesadapter.cpp
View file

@ -78,16 +78,6 @@ MessagesAdapter::setupChatView(const QString& convUid)
auto selectedAccountId = lrcInstance_->getCurrentAccountId(); auto selectedAccountId = lrcInstance_->getCurrentAccountId();
auto& accountInfo = lrcInstance_->accountModel().getAccountInfo(selectedAccountId); 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_, QMetaObject::invokeMethod(qmlObj_,
"setSendContactRequestButtonVisible", "setSendContactRequestButtonVisible",
Q_ARG(QVariant, convInfo.isNotASwarm() && convInfo.isRequest)); Q_ARG(QVariant, convInfo.isNotASwarm() && convInfo.isRequest));
@ -100,7 +90,7 @@ MessagesAdapter::setupChatView(const QString& convUid)
setMessagesVisibility(false); setMessagesVisibility(false);
setIsSwarm(!convInfo.isNotASwarm()); setIsSwarm(!convInfo.isNotASwarm());
setInvitation(convInfo.isRequest or convInfo.needsSyncing, setInvitation(convInfo.isRequest or convInfo.needsSyncing,
bestName, convModel->title(convInfo.uid),
contactURI, contactURI,
!convInfo.isNotASwarm(), !convInfo.isNotASwarm(),
convInfo.needsSyncing); convInfo.needsSyncing);