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

Make the 'encrypt this room' knob be megolm
This commit is contained in:
Richard van der Hoff 2016-09-03 18:50:28 +01:00 committed by GitHub
commit 941dcc7e87

View File

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