summaryrefslogtreecommitdiffstats
path: root/src/Olm.cpp
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-14 16:27:51 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-14 16:27:51 +0300
commitc4613b210ee6003be91b7e21a44ef1a918f96657 (patch)
tree6f71ee0cd9fa2fae0748c73e728e2a763c45bda9 /src/Olm.cpp
parent888700743a5bb1147929a4921fa418212c90c3c1 (diff)
Fix Windows build
Diffstat (limited to 'src/Olm.cpp')
-rw-r--r--src/Olm.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp
index cf54f4d4..d040e0ca 100644
--- a/src/Olm.cpp
+++ b/src/Olm.cpp
@@ -90,9 +90,9 @@ handle_olm_message(const OlmMessage &msg)
auto payload = try_olm_decryption(msg.sender_key, cipher.second);
- if (payload) {
- nhlog::crypto()->info("decrypted olm payload: {}", payload.value().dump(2));
- create_inbound_megolm_session(msg.sender, msg.sender_key, payload.value());
+ if (!payload.is_null()) {
+ nhlog::crypto()->info("decrypted olm payload: {}", payload.dump(2));
+ create_inbound_megolm_session(msg.sender, msg.sender_key, payload);
return;
}
@@ -184,7 +184,7 @@ encrypt_group_message(const std::string &room_id,
return data;
}
-boost::optional<json>
+nlohmann::json
try_olm_decryption(const std::string &sender_key, const mtx::events::msg::OlmCipherContent &msg)
{
auto session_ids = cache::client()->getOlmSessions(sender_key);
@@ -203,7 +203,6 @@ try_olm_decryption(const std::string &sender_key, const mtx::events::msg::OlmCip
try {
text = olm::client()->decrypt_message(session->get(), msg.type, msg.body);
cache::client()->saveOlmSession(id, std::move(session.value()));
-
} catch (const olm_exception &e) {
nhlog::crypto()->info("failed to decrypt olm message ({}, {}) with {}: {}",
msg.type,