Skip to content
Snippets Groups Projects
Commit cc5897f3 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

conversation_module: remove requests from self

This should not happen. Probably a relic of the past, but should be
removed.

Change-Id: Ic1506dc6b7e3e7ef75e743193e7606c46c53b662
parent 646043d9
No related branches found
No related tags found
No related merge requests found
...@@ -1183,6 +1183,19 @@ ConversationModule::Impl::fixStructures(std::shared_ptr<JamiAccount> acc, const ...@@ -1183,6 +1183,19 @@ ConversationModule::Impl::fixStructures(std::shared_ptr<JamiAccount> acc, const
} }
} }
} }
auto requestRemoved = false;
for (auto it = conversationsRequests_.begin(); it != conversationsRequests_.end();) {
if (it->second.from == username_) {
JAMI_WARNING("Detected request from ourself, this makes no sense. Remove {}", it->first);
it = conversationsRequests_.erase(it);
} else {
++it;
}
}
if (requestRemoved) {
saveConvRequests();
}
} }
for (const auto& invalidPendingRequest : invalidPendingRequests) for (const auto& invalidPendingRequest : invalidPendingRequests)
acc->discardTrustRequest(invalidPendingRequest); acc->discardTrustRequest(invalidPendingRequest);
...@@ -2167,6 +2180,10 @@ ConversationModule::onSyncData(const SyncMsg& msg, ...@@ -2167,6 +2180,10 @@ ConversationModule::onSyncData(const SyncMsg& msg,
} }
for (const auto& [convId, req] : msg.cr) { for (const auto& [convId, req] : msg.cr) {
if (req.from == pimpl_->username_) {
JAMI_WARNING("Detected request from ourself, ignore {}.", convId);
continue;
}
if (pimpl_->isConversation(convId)) { if (pimpl_->isConversation(convId)) {
// Already handled request // Already handled request
pimpl_->rmConversationRequest(convId); pimpl_->rmConversationRequest(convId);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment