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

messagesadapter: use acceptConversationRequest api

Browse source 
To accept incoming requests, a new acceptConversationRequest api
should be used and makePermanent is now only called for outgoing
requests.

Change-Id: I70bcfc0e323ae250641420f4fda91c6987cac720
This commit is contained in:
Andreas Traczyk 2021-06-25 14:33:56 -04:00 • committed by Sébastien Blin
parent 2865b3841f
commit 8409355e93
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/conversationsadapter.cpp
View file

@ -116,7 +116,8 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray,
auto& convInfo = lrcInstance_->getConversationFromPeerUri(peerUri, accountId); auto& convInfo = lrcInstance_->getConversationFromPeerUri(peerUri, accountId);
if (convInfo.uid.isEmpty()) if (convInfo.uid.isEmpty())
return; return;
lrcInstance_->makeConversationPermanent(convInfo.uid, accountId); auto* convModel = lrcInstance_->getAccountInfo(accountId).conversationModel;
convModel->acceptConversationRequest(convInfo.uid);
}); });
connect(systemTray_, connect(systemTray_,
&SystemTray::refusePendingActivated, &SystemTray::refusePendingActivated,
@ -124,8 +125,8 @@ ConversationsAdapter::ConversationsAdapter(SystemTray* systemTray,
auto& convInfo = lrcInstance_->getConversationFromPeerUri(peerUri, accountId); auto& convInfo = lrcInstance_->getConversationFromPeerUri(peerUri, accountId);
if (convInfo.uid.isEmpty()) if (convInfo.uid.isEmpty())
return; return;
lrcInstance_->getAccountInfo(accountId).conversationModel->removeConversation( auto* convModel = lrcInstance_->getAccountInfo(accountId).conversationModel;
convInfo.uid); convModel->removeConversation(convInfo.uid);
}); });
#endif #endif
} }

2
src/lrcinstance.cpp
View file

@ -440,7 +440,7 @@ LRCInstance::makeConversationPermanent(const QString& convId, const QString& acc
const auto& accInfo = accountModel().getAccountInfo(aId); const auto& accInfo = accountModel().getAccountInfo(aId);
auto cId = convId.isEmpty() ? selectedConvUid_ : convId; auto cId = convId.isEmpty() ? selectedConvUid_ : convId;
if (cId.isEmpty()) { if (cId.isEmpty()) {
qWarning() << Q_FUNC_INFO << "no Id provided"; qWarning() << Q_FUNC_INFO << "no conversation to make permanent";
return; return;
} }
accInfo.conversationModel.get()->makePermanent(cId); accInfo.conversationModel.get()->makePermanent(cId);

8
src/messagesadapter.cpp
View file

@ -715,10 +715,12 @@ MessagesAdapter::contactIsComposing(const QString& contactUri, bool isComposing)
} }
void void
MessagesAdapter::acceptInvitation(const QString& convUid) MessagesAdapter::acceptInvitation(const QString& convId)
{ {
lrcInstance_->makeConversationPermanent(convUid); auto conversationId = convId.isEmpty() ? lrcInstance_->get_selectedConvUid() : convId;
if (convUid == currentConvUid_) auto* convModel = lrcInstance_->getCurrentConversationModel();
convModel->acceptConversationRequest(conversationId);
if (conversationId == currentConvUid_)
currentConvUid_.clear(); currentConvUid_.clear();
} }