summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-07 23:59:23 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-07 23:59:23 +0300
commit278eccc04086f3033c71a753f0fc0ab35a3cbb66 (patch)
treef246fc75066150e2901a4be33dc6a604ac4a2505 /include
parentAdd a timeline message when encryption is enabled (diff)
downloadnheko-278eccc04086f3033c71a753f0fc0ab35a3cbb66.tar.xz
Add context menu action to request encryption keys
Diffstat (limited to 'include')
-rw-r--r--include/Olm.hpp16
-rw-r--r--include/timeline/TimelineItem.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/include/Olm.hpp b/include/Olm.hpp

index 58568081..2730b18c 100644 --- a/include/Olm.hpp +++ b/include/Olm.hpp
@@ -67,4 +67,20 @@ encrypt_group_message(const std::string &room_id, void mark_keys_as_published(); +//! Request the encryption keys from sender's device for the given event. +void +request_keys(const std::string &room_id, const std::string &event_id); + +void +send_key_request_for(const std::string &room_id, + const mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> &); + +void +handle_key_request_message(const mtx::events::msg::KeyRequest &); + +void +send_megolm_key_to_device(const std::string &user_id, + const std::string &device_id, + const json &payload); + } // namespace olm diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h
index 95d4be3d..d3cab0a0 100644 --- a/include/timeline/TimelineItem.h +++ b/include/timeline/TimelineItem.h
@@ -241,6 +241,7 @@ public: //! Add a user avatar for this event. void addAvatar(); + void addKeyRequestAction(); signals: void eventRedacted(const QString &event_id);