diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp index 7e93f0711c34cafe1c6f8189a7b30305e2b81b95..7b0131dc3cbe0ff917d705d79555aee67bffda9c 100644 --- a/src/jamidht/jamiaccount.cpp +++ b/src/jamidht/jamiaccount.cpp @@ -3785,7 +3785,6 @@ JamiAccount::acceptConversationRequest(const std::string& conversationId) if (auto shared = w.lock()) shared->addNewConversation(info); }); - syncWithConnected(); checkConversationsEvents(); } @@ -3862,6 +3861,8 @@ JamiAccount::handlePendingConversations() // Inform user that the conversation is ready emitSignal<DRing::ConversationSignal::ConversationReady>(shared->accountID_, conversationId); + shared + ->syncWithConnected(); // This informs other devices to clone the conversation } } catch (const std::exception& e) { emitSignal<DRing::ConversationSignal::OnConversationError>(shared->accountID_, diff --git a/src/jamidht/multiplexed_socket.cpp b/src/jamidht/multiplexed_socket.cpp index cd3c3d00be3c5aec80ad9a013b5a923549ad298f..901a36fb75f3c15f818ccbc1454ce51293dbc19f 100644 --- a/src/jamidht/multiplexed_socket.cpp +++ b/src/jamidht/multiplexed_socket.cpp @@ -125,7 +125,8 @@ public: channelSocket = std::make_shared<ChannelSocket>(parent_.weak(), name, channel); else { JAMI_WARN("A channel is already present on that socket, accepting " - "the request will close the previous one"); + "the request will close the previous one %s", + name.c_str()); } return channelSocket; } diff --git a/test/unitTest/syncHistory/syncHistory.cpp b/test/unitTest/syncHistory/syncHistory.cpp index be8e461671af5685b428d8abbbc21c1f3c0c33e0..7608518ab1fc111af3f672b14bfd2677077a4bd2 100644 --- a/test/unitTest/syncHistory/syncHistory.cpp +++ b/test/unitTest/syncHistory/syncHistory.cpp @@ -154,6 +154,7 @@ SyncHistoryTest::testCreateConversationThenSync() return alice2Ready && conversationReady; })); std::remove(aliceArchive.c_str()); + DRing::unregisterSignalHandlers(); } void @@ -597,6 +598,7 @@ SyncHistoryTest::testSyncCreateAccountExportDeleteReimportOldBackup() aliceAccount->sendMessage(convId, std::string("hi")); cv.wait_for(lk, std::chrono::seconds(30), [&]() { return messageBobReceived == 1; }); std::remove(aliceArchive.c_str()); + DRing::unregisterSignalHandlers(); } void @@ -710,6 +712,7 @@ SyncHistoryTest::testSyncCreateAccountExportDeleteReimportWithConvId() aliceAccount->sendMessage(convId, std::string("hi")); cv.wait_for(lk, std::chrono::seconds(30), [&]() { return messageBobReceived == 1; }); std::remove(aliceArchive.c_str()); + DRing::unregisterSignalHandlers(); } void @@ -806,6 +809,7 @@ SyncHistoryTest::testSyncCreateAccountExportDeleteReimportWithConvReq() return conversationReady && messageBobReceived == 1; })); std::remove(aliceArchive.c_str()); + DRing::unregisterSignalHandlers(); } void @@ -862,6 +866,7 @@ SyncHistoryTest::testSyncOneToOne() return alice2Ready && conversationReady; })); std::remove(aliceArchive.c_str()); + DRing::unregisterSignalHandlers(); } void