d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix variable shadowing that caused the key response to be null

Browse source
This commit is contained in:
Konstantinos Sideris 2018-07-08 21:24:44 +03:00
parent 278eccc040
commit 6d474b77f1
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Olm.cpp
View file

@ -494,7 +494,7 @@ send_megolm_key_to_device(const std::string &user_id,
auto olm_session = olm::client()->create_outbound_session( auto olm_session = olm::client()->create_outbound_session(
pks.curve25519, device.begin()->at("key")); pks.curve25519, device.begin()->at("key"));
auto device_msg = olm::client()->create_olm_encrypted_content( device_msg = olm::client()->create_olm_encrypted_content(
olm_session.get(), room_key, pks.curve25519); olm_session.get(), room_key, pks.curve25519);
cache::client()->saveOlmSession(pks.curve25519, cache::client()->saveOlmSession(pks.curve25519,
@ -511,7 +511,8 @@ send_megolm_key_to_device(const std::string &user_id,
body["messages"][user_id][device_id] = device_msg; body["messages"][user_id][device_id] = device_msg;
nhlog::net()->info("send_to_device: {}", user_id); nhlog::net()->info(
"sending m.room_key event to {}:{}", user_id, device_id);
http::v2::client()->send_to_device( http::v2::client()->send_to_device(
"m.room.encrypted", body, [user_id](mtx::http::RequestErr err) { "m.room.encrypted", body, [user_id](mtx::http::RequestErr err) {
if (err) { if (err) {

2
src/timeline/TimelineView.cc
View file

@ -1450,5 +1450,7 @@ TimelineView::handleClaimedKeys(std::shared_ptr<StateKeeper> keeper,
"message: {}", "message: {}",
err->matrix_error.error); err->matrix_error.error);
} }
(void)keeper;
}); });
} }