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

Make the 'encrypt this room' knob be megolm
2016-09-03 18:50:28 +01:00 · 2016-09-03 18:50:28 +01:00 · 941dcc7e87
parent fdfd6ecfd9 bc8e7724e8
commit 941dcc7e87
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@ -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" }
        );
    },