Skip to content

Commit

Permalink
Get confirmation before enabling encryption
Browse files Browse the repository at this point in the history
  • Loading branch information
turt2live committed Mar 1, 2019
1 parent 8d78378 commit 21fc480
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 8 deletions.
40 changes: 32 additions & 8 deletions src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import MatrixClientPeg from "../../../../../MatrixClientPeg";
import sdk from "../../../../..";
import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
import {SettingLevel} from "../../../../../settings/SettingsStore";
import Modal from "../../../../../Modal";
import QuestionDialog from "../../../dialogs/QuestionDialog";

export default class SecurityRoomSettingsTab extends React.Component {
static propTypes = {
Expand Down Expand Up @@ -83,14 +85,36 @@ export default class SecurityRoomSettingsTab extends React.Component {
};

_onEncryptionChange = (e) => {
const beforeEncrypted = this.state.encrypted;
this.setState({encrypted: true});
MatrixClientPeg.get().sendStateEvent(
this.props.roomId, "m.room.encryption",
{ algorithm: "m.megolm.v1.aes-sha2" },
).catch((e) => {
console.error(e);
this.setState({encrypted: beforeEncrypted});
Modal.createTrackedDialog('Enable encryption', '', QuestionDialog, {
title: _t('Enable encryption?'),
description: _t(
"Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted " +
"room cannot be seen by the server, only be the participants of the room. Enabling encryption " +
"may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
{},
{
'a': (sub) => {
return <a rel='noopener' target='_blank'
href='https://about.riot.im/help#end-to-end-encryption'>{sub}</a>;
}
},
),
onFinished: (confirm) => {
if (!confirm) {
this.setState({encrypted: false});
return;
}

const beforeEncrypted = this.state.encrypted;
this.setState({encrypted: true});
MatrixClientPeg.get().sendStateEvent(
this.props.roomId, "m.room.encryption",
{ algorithm: "m.megolm.v1.aes-sha2" },
).catch((e) => {
console.error(e);
this.setState({encrypted: beforeEncrypted});
});
},
});
};

Expand Down
2 changes: 2 additions & 0 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,8 @@
"To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
"Roles & Permissions": "Roles & Permissions",
"Permissions": "Permissions",
"Enable encryption?": "Enable encryption?",
"Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only be the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only be the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
"Click here to fix": "Click here to fix",
"To link to this room, please add an alias.": "To link to this room, please add an alias.",
Expand Down

0 comments on commit 21fc480

Please sign in to comment.