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

Load sessions lazily from db

Browse source
This commit is contained in:
Nicolas Werner 2020-11-27 04:19:03 +01:00
parent 37b971adb2
commit c24f9a22a5
6 changed files with 42 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Olm.cpp
View file

@ -534,7 +534,7 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR
return;
}
auto session_key = mtx::crypto::export_session(session);
auto session_key = mtx::crypto::export_session(session.get());
//
// Prepare the m.room_key event.
//
@ -584,8 +584,9 @@ decryptEvent(const MegolmSessionIndex &index,
std::string msg_str;
try {
auto session = cache::client()->getInboundMegolmSession(index);
auto res = olm::client()->decrypt_group_message(session, event.content.ciphertext);
msg_str = std::string((char *)res.data.data(), res.data.size());
auto res =
olm::client()->decrypt_group_message(session.get(), event.content.ciphertext);
msg_str = std::string((char *)res.data.data(), res.data.size());
} catch (const lmdb::error &e) {
return {DecryptionErrorCode::DbError, e.what(), std::nullopt};
} catch (const mtx::crypto::olm_exception &e) {