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

conversationsadapter: use convId from request

Browse source 
This fix notification's actions for the notification, finding the
correct convId.

GitLab: #455
Change-Id: I9b70f723eacd930f95c2eaf01ecd52b8c5d28313
This commit is contained in:
Sébastien Blin 2021-07-05 09:34:25 -04:00
parent ccd7e08c3f
commit 96c0084c3b
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/conversationsadapter.cpp
View file

@ -221,17 +221,20 @@ ConversationsAdapter::onNewReadInteraction(const QString& accountId,
} }
void void
ConversationsAdapter::onNewTrustRequest(const QString& accountId, const QString& peerUri) ConversationsAdapter::onNewTrustRequest(const QString& accountId, const QString& convId, const QString& peerUri)
{ {
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
if (!QApplication::focusWindow() || accountId != lrcInstance_->getCurrentAccountId()) { if (!QApplication::focusWindow() || accountId != lrcInstance_->getCurrentAccountId()) {
auto conv = convId;
if (conv.isEmpty()) {
auto& convInfo = lrcInstance_->getConversationFromPeerUri(peerUri); auto& convInfo = lrcInstance_->getConversationFromPeerUri(peerUri);
if (convInfo.uid.isEmpty()) if (convInfo.uid.isEmpty())
return; return;
}
auto& accInfo = lrcInstance_->getAccountInfo(accountId); auto& accInfo = lrcInstance_->getAccountInfo(accountId);
auto from = accInfo.contactModel->bestNameForContact(peerUri); auto from = accInfo.contactModel->bestNameForContact(peerUri);
auto contactPhoto = Utils::contactPhoto(lrcInstance_, peerUri, QSize(50, 50), accountId); auto contactPhoto = Utils::contactPhoto(lrcInstance_, peerUri, QSize(50, 50), accountId);
auto notifId = QString("%1;%2").arg(accountId).arg(convInfo.uid); auto notifId = QString("%1;%2").arg(accountId).arg(conv);
systemTray_->showNotification(notifId, systemTray_->showNotification(notifId,
tr("Trust request"), tr("Trust request"),
"New request from " + from, "New request from " + from,

2
src/conversationsadapter.h
View file

@ -70,7 +70,7 @@ private Q_SLOTS:
void onNewReadInteraction(const QString& accountId, void onNewReadInteraction(const QString& accountId,
const QString& convUid, const QString& convUid,
const QString& interactionId); const QString& interactionId);
void onNewTrustRequest(const QString& accountId, const QString& peerUri); void onNewTrustRequest(const QString& accountId, const QString& convId, const QString& peerUri);
void onTrustRequestTreated(const QString& accountId, const QString& peerUri); void onTrustRequestTreated(const QString& accountId, const QString& peerUri);
// per-account slots // per-account slots