summary refs log tree commit diff
path: root/src/Olm.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-12-08 21:38:02 +0100
committerGitHub <noreply@github.com>2020-12-08 21:38:02 +0100
commita551ede742a2fb03c68fa54b900c2d14f7a8133f (patch)
treeffa3c5b607eef8effc0019a5733dfd2326ea96b6 /src/Olm.cpp
parentAdd DMG build to Gitlab CI (diff)
parentUpdate Readme CI link (diff)
downloadnheko-a551ede742a2fb03c68fa54b900c2d14f7a8133f.tar.xz
Merge pull request #352 from Nheko-Reborn/lint
lint
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;