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

conversationmodel: do not add wrong call to wrong conversation

Browse source 
GitLab: #1578
Change-Id: Ibe980844acf1b44afb0ea6aa0e105ffa99e5c36f
This commit is contained in:
Sébastien Blin 2024-02-27 13:03:34 -05:00
parent 5c2fec53da
commit 1c81553245
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libclient/conversationmodel.cpp
View file

@ -3218,7 +3218,6 @@ ConversationModelPimpl::slotNewCall(const QString& fromId,
} }
auto& conversation = conversations.at(conversationIndices.at(0)); auto& conversation = conversations.at(conversationIndices.at(0));
qDebug() << "Add call to conversation " << conversation.uid << " - " << callId;
conversation.callId = callId; conversation.callId = callId;
addOrUpdateCallMessage(callId, fromId, true); addOrUpdateCallMessage(callId, fromId, true);
@ -3315,13 +3314,13 @@ ConversationModelPimpl::addOrUpdateCallMessage(const QString& callId,
} }
try { try {
auto& conv = getConversationForPeerUri(from).get(); auto& conv = getConversationForPeerUri(from).get();
if (conv.callId.isEmpty()) if (!conv.isSwarm() && conv.callId.isEmpty()) {
conv.callId = callId; conv.callId = callId;
}
} catch (...) { } catch (...) {
return; return;
} }
} }
// do not save call interaction for swarm conversation
if (conv_it->isSwarm()) if (conv_it->isSwarm())
return; return;
auto uriString = incoming ? storage::prepareUri(from, linked.owner.profileInfo.type) auto uriString = incoming ? storage::prepareUri(from, linked.owner.profileInfo.type)