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

conversation: do not add conversation request if accepted

Browse Source 
Change-Id: I7fb785243b6684ab9a02f9364e65b118a88c120d
This commit is contained in:
Sébastien Blin
2023-01-10 12:04:42 -05:00
parent c1533c9e0a
commit ddb36d0fe9
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,10 +396,6 @@ ConversationTest::testSendMessageWithBadDisplayName()
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
std::map<std::string, std::string> details;
details[ConfProperties::DISPLAYNAME] = "<o>";
libjami::setAccountDetails(aliceId, details);
std::mutex mtx;
std::unique_lock<std::mutex> lk {mtx};
std::condition_variable cv;
@ -433,8 +429,24 @@ ConversationTest::testSendMessageWithBadDisplayName()
cv.notify_one();
}
}));
bool aliceRegistered = false;
confHandlers.insert(
libjami::exportable_callback<libjami::ConfigurationSignal::VolatileDetailsChanged>(
[&](const std::string&, const std::map<std::string, std::string>&) {
auto details = aliceAccount->getVolatileAccountDetails();
auto daemonStatus = details[libjami::Account::ConfProperties::Registration::STATUS];
if (daemonStatus == "REGISTERED") {
aliceRegistered = true;
cv.notify_one();
}
}));
libjami::registerSignalHandlers(confHandlers);
std::map<std::string, std::string> details;
details[ConfProperties::DISPLAYNAME] = "<o>";
libjami::setAccountDetails(aliceId, details);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceRegistered; }));
auto convId = libjami::startConversation(aliceId);
libjami::addConversationMember(aliceId, convId, bobUri);