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 reply detection when multiple devices

Browse Source 
Change-Id: I506a9e1649a683339dc9ebfaa1c18b0e9394bb20
This commit is contained in:
Sébastien Blin
2020-02-11 15:36:08 -05:00
parent 6c5a1a88da
commit aed1e342b7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jamidht/jamiaccount.cpp
View File

@ -156,8 +156,7 @@ struct JamiAccount::PendingCall
struct JamiAccount::PendingMessage
{
dht::InfoHash to;
std::chrono::steady_clock::time_point received;
std::set<dht::InfoHash> to;
};
struct AccountPeerInfo
@ -2498,8 +2497,7 @@ JamiAccount::sendTextMessage(const std::string& to, const std::map<std::string,
{
{
std::lock_guard<std::mutex> lock(messageMutex_);
auto e = sentMessages_.emplace(token, PendingMessage {});
e.first->second.to = dev;
sentMessages_[token].to.emplace(dev);
}
auto h = dht::InfoHash::get("inbox:"+dev.toString());
@ -2512,7 +2510,7 @@ JamiAccount::sendTextMessage(const std::string& to, const std::map<std::string,
{
std::lock_guard<std::mutex> lock(messageMutex_);
auto e = sentMessages_.find(msg.id);
if (e == sentMessages_.end() or e->second.to != msg.from) {
if (e == sentMessages_.end() or e->second.to.find(msg.from) == e->second.to.end()) {
JAMI_DBG() << "[Account " << getAccountID() << "] [message " << token << "] Message not found";
return true;
}