summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-25 17:19:52 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-25 17:19:52 +0300
commit9802ea8809812a8e0eb2879233a2df1109c271cf (patch)
treee00d317a9410d851d4d6739d8c386f40a3fb002f /include
parentAdd entry for GCC5 on Travis-CI (diff)
downloadnheko-9802ea8809812a8e0eb2879233a2df1109c271cf.tar.xz
Send one claim request per user that includes all devices
Add missing megolm algorithm field that was causing
the "unknown algorithm" error.
Diffstat (limited to 'include')
-rw-r--r--include/timeline/TimelineView.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h

index a86c0286..bbe1dcad 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h
@@ -195,10 +195,9 @@ private: const mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> &e); void handleClaimedKeys(std::shared_ptr<StateKeeper> keeper, - const std::string &room_key, - const DevicePublicKeys &pks, + const std::map<std::string, std::string> &room_key, + const std::map<std::string, DevicePublicKeys> &pks, const std::string &user_id, - const std::string &device_id, const mtx::responses::ClaimKeys &res, mtx::http::RequestErr err);