summary refs log tree commit diff
path: root/src/encryption/DeviceVerificationFlow.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:32:49 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:33:43 +0100
commita13f492e7d587ade54606a77c4e9f497a0fea737 (patch)
treeffb115cd17450e8094e7e15e0d04f2d5d2e9a852 /src/encryption/DeviceVerificationFlow.cpp
parentMerge pull request #822 from Nheko-Reborn/dm-filter (diff)
downloadnheko-a13f492e7d587ade54606a77c4e9f497a0fea737.tar.xz
Make clang-format <13 and clang-format >=13 behave the same
I think old clang-format is just buggy in those cases, so we should
reenable those blocks, once everyone has 13 or up.
Diffstat (limited to 'src/encryption/DeviceVerificationFlow.cpp')
-rw-r--r--src/encryption/DeviceVerificationFlow.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp

index f05d5c9f..42a0d041 100644 --- a/src/encryption/DeviceVerificationFlow.cpp +++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -662,9 +662,12 @@ DeviceVerificationFlow::sendVerificationRequest() } else if (this->type == DeviceVerificationFlow::Type::RoomMsg && model_) { req.to = this->toClient.to_string(); req.msgtype = "m.key.verification.request"; + // clang-format off + // clang-format < 12 is buggy on this req.body = "User is requesting to verify keys with you. However, your client does " - "not support this method, so you will need to use the legacy method of " - "key verification."; + "not support this method, so you will need to use the legacy method of " + "key verification."; + // clang-format on } send(req);