summary refs log tree commit diff
path: root/src/Olm.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-11-13 18:15:35 +0100
committerGitHub <noreply@github.com>2020-11-13 18:15:35 +0100
commit4d9d049f2ab8fd02fd28e55043e68f49ba2817ff (patch)
treec1166b8f3515179e45bf827e9e71757c96637660 /src/Olm.cpp
parentMerge pull request #314 from MayeulC/smoothie-2 (diff)
parentclang-format (diff)
downloadnheko-4d9d049f2ab8fd02fd28e55043e68f49ba2817ff.tar.xz
Merge pull request #325 from trilene/webrtc-video
Make incoming call ringtone a user setting
Diffstat (limited to 'src/Olm.cpp')
-rw-r--r--src/Olm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp

index cdafabf3..af8bb512 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp
@@ -435,8 +435,8 @@ 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::Request + : mtx::events::msg::RequestAction::Cancellation; request.algorithm = MEGOLM_ALGO; request.room_id = e.room_id; request.sender_key = e.content.sender_key;