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

contacts: remove unlocked saveTrustRequests

GitLab: #942
Change-Id: Ifdd50fc15695123f5ec41cb3eabb3a23b79e85dc
parent 387d4eeb
No related branches found
No related tags found
No related merge requests found
...@@ -103,7 +103,6 @@ AccountManager::onSyncData(DeviceSync&& sync, bool checkDevice) ...@@ -103,7 +103,6 @@ AccountManager::onSyncData(DeviceSync&& sync, bool checkDevice)
false, false,
tr.second.conversationId, tr.second.conversationId,
{}); {});
info_->contacts->saveTrustRequests();
} }
dht::crypto::Identity dht::crypto::Identity
...@@ -359,7 +358,6 @@ AccountManager::startSync(const OnNewDeviceCb& cb, const OnDeviceAnnouncedCb& dc ...@@ -359,7 +358,6 @@ AccountManager::startSync(const OnNewDeviceCb& cb, const OnDeviceAnnouncedCb& dc
JAMI_WARNING("Accept with old convId: {}", conversationId); JAMI_WARNING("Accept with old convId: {}", conversationId);
} }
sendTrustRequestConfirm(peer_account, conversationId); sendTrustRequestConfirm(peer_account, conversationId);
info_->contacts->saveTrustRequests();
} }
}); });
return true; return true;
......
...@@ -254,6 +254,7 @@ ContactList::saveContacts() const ...@@ -254,6 +254,7 @@ ContactList::saveContacts() const
void void
ContactList::saveTrustRequests() const ContactList::saveTrustRequests() const
{ {
// mutex_ MUST BE locked
std::ofstream file(path_ / "incomingTrustRequests", std::ofstream file(path_ / "incomingTrustRequests",
std::ios::trunc | std::ios::binary); std::ios::trunc | std::ios::binary);
msgpack::pack(file, trustRequests_); msgpack::pack(file, trustRequests_);
......
...@@ -128,9 +128,6 @@ public: ...@@ -128,9 +128,6 @@ public:
bool acceptTrustRequest(const dht::InfoHash& from); bool acceptTrustRequest(const dht::InfoHash& from);
bool discardTrustRequest(const dht::InfoHash& from); bool discardTrustRequest(const dht::InfoHash& from);
/** Should be called only after onTrustRequest */
void saveTrustRequests() const;
/* Devices */ /* Devices */
const std::map<dht::PkId, KnownDevice>& getKnownDevices() const { return knownDevices_; } const std::map<dht::PkId, KnownDevice>& getKnownDevices() const { return knownDevices_; }
void foundAccountDevice(const dht::PkId& device, void foundAccountDevice(const dht::PkId& device,
...@@ -169,6 +166,9 @@ private: ...@@ -169,6 +166,9 @@ private:
void loadKnownDevices(); void loadKnownDevices();
void saveKnownDevices() const; void saveKnownDevices() const;
/** Should be called only after onTrustRequest */
void saveTrustRequests() const;
}; };
} // namespace jami } // namespace jami
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment