jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

jamiaccount: fix deadlock

Browse Source 
This patch moves the updateConvForContact function from JamiAccount to
ConversationModule. This fixes a deadlock that sometimes occurred when
starting Jami.

GitLab: #1033
Change-Id: I441426fa339e5cfb327566df6132bfecb206bd1e
This commit is contained in:
François-Simon Fauteux-Chapleau
2024-07-15 14:36:12 -04:00
parent 4e84cc5de7
commit 2a805d24fe
5 changed files with 50 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unitTest/conversation/conversation.cpp
View File

@ -2145,7 +2145,7 @@ ConversationTest::testFixContactDetails()
auto details = aliceAccount->getContactDetails(bobUri);
CPPUNIT_ASSERT(details["conversationId"] == aliceData.conversationId);
// Erase convId from contact details, this should be fixed by next reload.
CPPUNIT_ASSERT(aliceAccount->updateConvForContact(bobUri, aliceData.conversationId, ""));
CPPUNIT_ASSERT(aliceAccount->convModule()->updateConvForContact(bobUri, aliceData.conversationId, ""));
details = aliceAccount->getContactDetails(bobUri);
CPPUNIT_ASSERT(details["conversationId"].empty());