summary refs log tree commit diff
path: root/src/Olm.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-12-08 15:57:16 -0500
committerJoseph Donofry <joedonofry@gmail.com>2020-12-08 15:57:16 -0500
commit0310c9804624ff8a3e011186216d57ac8cdf411c (patch)
treee66864bf7f547bf32420f062da86a1d483091cd8 /src/Olm.cpp
parentAdd VERSION to macos build (diff)
parentMerge pull request #352 from Nheko-Reborn/lint (diff)
downloadnheko-0310c9804624ff8a3e011186216d57ac8cdf411c.tar.xz
Merge branch 'master' of ssh://github.com/Nheko-Reborn/nheko
Diffstat (limited to 'src/Olm.cpp')
-rw-r--r--src/Olm.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp

index 808279a3..1f58758c 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp
@@ -602,8 +602,9 @@ send_key_request_for(mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> e, e.content.session_id); mtx::events::msg::KeyRequest request; - request.action = !cancel ? mtx::events::msg::RequestAction::Request - : mtx::events::msg::RequestAction::Cancellation; + request.action = cancel ? mtx::events::msg::RequestAction::Cancellation + : mtx::events::msg::RequestAction::Request; + request.algorithm = MEGOLM_ALGO; request.room_id = e.room_id; request.sender_key = e.content.sender_key;