matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-19 05:22:13 +03:00
Code Activity

Merge pull request #3860 from matrix-org/jryans/disable-key-request

Browse Source 
Disable key request dialogs with cross-signing
This commit is contained in:
J. Ryan Stinnett
2020-01-17 14:24:23 +00:00
committed by GitHub
parent a525ba57c7 9b64686041
commit 1a6be3addd
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View File

@@ -1383,6 +1383,8 @@ export default createReactClass({
cli.on("Session.logged_out", () => dft.stop());
cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
// TODO: We can remove this once cross-signing is the only way.
// https://github.com/vector-im/riot-web/issues/11908
const krh = new KeyRequestHandler(cli);
cli.on("crypto.roomKeyRequest", (req) => {
krh.handleKeyRequest(req);