thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge matrix-structs into the client lib

Browse source
This commit is contained in:
Konstantinos Sideris 2018-09-01 13:35:10 +03:00
parent d0e31c43a6
commit 990a3a97c7
14 changed files with 121 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Olm.cpp
View file

@ -1,3 +1,5 @@
#include <boost/variant.hpp>
#include "Olm.h"
#include "Cache.h"
@ -288,14 +290,14 @@ request_keys(const std::string &room_id, const std::string &event_id)
return;
}
if (!mpark::holds_alternative<EncryptedEvent<msg::Encrypted>>(res)) {
if (boost::get<EncryptedEvent<msg::Encrypted>>(&res) == nullptr) {
nhlog::net()->info(
"retrieved event is not encrypted: {} from {}", event_id, room_id);
return;
}
olm::send_key_request_for(room_id,
mpark::get<EncryptedEvent<msg::Encrypted>>(res));
boost::get<EncryptedEvent<msg::Encrypted>>(res));
});
}