From 07e7ae5310c5bf9d8240bc5c84a0a16df7907532 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Tue, 21 Feb 2023 09:25:55 -0300
Subject: [PATCH] misc: fix right click on self contact
Change-Id: I003bad0416c541e7e02f80d01734d71ccd453818
GitLab: #992
---
src/app/conversationlistmodelbase.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/app/conversationlistmodelbase.cpp b/src/app/conversationlistmodelbase.cpp
index 4e88d25fa..54fa22106 100644
--- a/src/app/conversationlistmodelbase.cpp
+++ b/src/app/conversationlistmodelbase.cpp
@@ -169,27 +169,28 @@ ConversationListModelBase::dataForItem(item_t item, int role) const
if (peerUriList.isEmpty())
return {};
auto peerUri = peerUriList.at(0);
- if (peerUri == lrcInstance_->getCurrentAccountInfo().profileInfo.uri) {
+ auto& accInfo = lrcInstance_->getCurrentAccountInfo();
+ if (peerUri == accInfo.profileInfo.uri) {
// Conversation alone with self
switch (role) {
case Role::BestId:
- return QVariant(lrcInstance_->accountModel().bestIdForAccount(peerUri));
+ return QVariant(lrcInstance_->accountModel().bestIdForAccount(accInfo.id));
case Role::Alias:
- return QVariant(lrcInstance_->getCurrentAccountInfo().profileInfo.alias);
+ return QVariant(accInfo.profileInfo.alias);
case Role::RegisteredName:
- return QVariant(lrcInstance_->getCurrentAccountInfo().registeredName);
+ return QVariant(accInfo.registeredName);
case Role::URI:
return QVariant(peerUri);
case Role::IsBanned:
return QVariant(false);
case Role::ContactType:
return QVariant(
- static_cast<int>(lrcInstance_->getCurrentAccountInfo().profileInfo.type));
+ static_cast<int>(accInfo.profileInfo.type));
}
}
ContactModel* contactModel;
contact::Info contact {};
- contactModel = lrcInstance_->getCurrentAccountInfo().contactModel.get();
+ contactModel = accInfo.contactModel.get();
try {
contact = contactModel->getContact(peerUri);
} catch (const std::exception&) {
--
GitLab