OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #439 from matrix-org/rav/enable_megolm_encryption 

Make the 'encrypt this room' knob be megolm
pull/21833/head
Richard van der Hoff 2016-09-03 18:50:28 +01:00 committed by GitHub
parent fdfd6ecfd9 bc8e7724e8
commit 941dcc7e87
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/RoomSettings.js
View File

@ -249,7 +249,7 @@ module.exports = React.createClass({
var roomId = this.props.room.roomId; var roomId = this.props.room.roomId;
return MatrixClientPeg.get().sendStateEvent( return MatrixClientPeg.get().sendStateEvent(
roomId, "m.room.encryption", roomId, "m.room.encryption",
{ algorithm: "m.olm.v1.curve25519-aes-sha2" } { algorithm: "m.megolm.v1.aes-sha2" }
); );
}, },