summary refs log tree commit diff
path: root/src/ChatPage.h
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-12-18 15:20:11 +0100
committerGitHub <noreply@github.com>2020-12-18 15:20:11 +0100
commit45701b0896c9e2ac8670feff3e46ba5932673025 (patch)
tree8a833c4a99a08bc92d160b14ebdd88fef8eb9298 /src/ChatPage.h
parentTranslated using Weblate (Finnish) (diff)
parentFix unused capture (diff)
downloadnheko-45701b0896c9e2ac8670feff3e46ba5932673025.tar.xz
Merge pull request #355 from Nheko-Reborn/ssss
Cross-signing with self and user signing keys
Diffstat (limited to 'src/ChatPage.h')
-rw-r--r--src/ChatPage.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChatPage.h b/src/ChatPage.h

index 5b336cbb..45a4ff63 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h
@@ -27,6 +27,7 @@ #include <mtx/events/encrypted.hpp> #include <mtx/events/member.hpp> #include <mtx/events/presence.hpp> +#include <mtx/secret_storage.hpp> #include <QFrame> #include <QHBoxLayout> @@ -72,6 +73,8 @@ namespace popups { class UserMentions; } +using SecretsToDecrypt = std::map<std::string, mtx::secret_storage::AesHmacSha2EncryptedData>; + class ChatPage : public QWidget { Q_OBJECT @@ -117,6 +120,8 @@ public slots: void unbanUser(QString userid, QString reason); void receivedSessionKey(const std::string &room_id, const std::string &session_id); + void decryptDownloadedSecrets(mtx::secret_storage::AesHmacSha2KeyDescription keyDesc, + const SecretsToDecrypt &secrets); signals: void connectionLost(); @@ -185,6 +190,9 @@ signals: void receivedDeviceVerificationReady(const mtx::events::msg::KeyVerificationReady &message); void receivedDeviceVerificationDone(const mtx::events::msg::KeyVerificationDone &message); + void downloadedSecrets(mtx::secret_storage::AesHmacSha2KeyDescription keyDesc, + const SecretsToDecrypt &secrets); + private slots: void logout(); void removeRoom(const QString &room_id);