Remove warning about encryption being beta
This commit is contained in:
parent
68ec63d25e
commit
016bd028ba
4 changed files with 12 additions and 81 deletions
|
@ -637,7 +637,6 @@ module.exports = React.createClass({
|
||||||
// called when state.room is first initialised (either at initial load,
|
// called when state.room is first initialised (either at initial load,
|
||||||
// after a successful peek, or after we join the room).
|
// after a successful peek, or after we join the room).
|
||||||
_onRoomLoaded: function(room) {
|
_onRoomLoaded: function(room) {
|
||||||
this._warnAboutEncryption(room);
|
|
||||||
this._calculatePeekRules(room);
|
this._calculatePeekRules(room);
|
||||||
this._updatePreviewUrlVisibility(room);
|
this._updatePreviewUrlVisibility(room);
|
||||||
this._loadMembersIfJoined(room);
|
this._loadMembersIfJoined(room);
|
||||||
|
@ -670,34 +669,6 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
_warnAboutEncryption: function(room) {
|
|
||||||
if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let userHasUsedEncryption = false;
|
|
||||||
if (localStorage) {
|
|
||||||
userHasUsedEncryption = localStorage.getItem('mx_user_has_used_encryption');
|
|
||||||
}
|
|
||||||
if (!userHasUsedEncryption) {
|
|
||||||
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
|
|
||||||
Modal.createTrackedDialog('E2E Warning', '', QuestionDialog, {
|
|
||||||
title: _t("Warning!"),
|
|
||||||
hasCancelButton: false,
|
|
||||||
description: (
|
|
||||||
<div>
|
|
||||||
<p>{ _t("End-to-end encryption is in beta and may not be reliable") }.</p>
|
|
||||||
<p>{ _t("You should not yet trust it to secure data") }.</p>
|
|
||||||
<p>{ _t("Devices will not yet be able to decrypt history from before they joined the room") }.</p>
|
|
||||||
<p>{ _t("Encrypted messages will not be visible on clients that do not yet implement encryption") }.</p>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (localStorage) {
|
|
||||||
localStorage.setItem('mx_user_has_used_encryption', true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
_calculatePeekRules: function(room) {
|
_calculatePeekRules: function(room) {
|
||||||
const guestAccessEvent = room.currentState.getStateEvents("m.room.guest_access", "");
|
const guestAccessEvent = room.currentState.getStateEvents("m.room.guest_access", "");
|
||||||
if (guestAccessEvent && guestAccessEvent.getContent().guest_access === "can_join") {
|
if (guestAccessEvent && guestAccessEvent.getContent().guest_access === "can_join") {
|
||||||
|
|
|
@ -538,29 +538,6 @@ module.exports = React.createClass({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
onEnableEncryptionClick() {
|
|
||||||
if (!this.refs.encrypt.checked) return;
|
|
||||||
|
|
||||||
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
|
|
||||||
Modal.createTrackedDialog('E2E Enable Warning', '', QuestionDialog, {
|
|
||||||
title: _t('Warning!'),
|
|
||||||
description: (
|
|
||||||
<div>
|
|
||||||
<p>{ _t('End-to-end encryption is in beta and may not be reliable') }.</p>
|
|
||||||
<p>{ _t('You should not yet trust it to secure data') }.</p>
|
|
||||||
<p>{ _t('Devices will not yet be able to decrypt history from before they joined the room') }.</p>
|
|
||||||
<p>{ _t('Once encryption is enabled for a room it cannot be turned off again (for now)') }.</p>
|
|
||||||
<p>{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.</p>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
onFinished: (confirm)=>{
|
|
||||||
if (!confirm) {
|
|
||||||
this.refs.encrypt.checked = false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
_onRoomUpgradeClick: function() {
|
_onRoomUpgradeClick: function() {
|
||||||
const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
|
const RoomUpgradeDialog = sdk.getComponent('dialogs.RoomUpgradeDialog');
|
||||||
Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, {room: this.props.room});
|
Modal.createTrackedDialog('Upgrade Room Version', '', RoomUpgradeDialog, {room: this.props.room});
|
||||||
|
@ -604,7 +581,7 @@ module.exports = React.createClass({
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" ref="encrypt" onClick={this.onEnableEncryptionClick} />
|
<input type="checkbox" ref="encrypt" />
|
||||||
<img className="mx_RoomSettings_e2eIcon mx_filterFlipColor" src={require("../../../../res/img/e2e-unencrypted.svg")} width="12" height="12" />
|
<img className="mx_RoomSettings_e2eIcon mx_filterFlipColor" src={require("../../../../res/img/e2e-unencrypted.svg")} width="12" height="12" />
|
||||||
{ _t('Enable encryption') } { _t('(warning: cannot be disabled again!)') }
|
{ _t('Enable encryption') } { _t('(warning: cannot be disabled again!)') }
|
||||||
</label>
|
</label>
|
||||||
|
|
|
@ -37,32 +37,20 @@ export default class SecurityRoomSettingsTab extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
_onStateEvent = (e) => {
|
_onStateEvent = (e) => {
|
||||||
const refreshWhenTypes = ['m.room.join_rules', 'm.room.guest_access', 'm.room.history_visibility'];
|
const refreshWhenTypes = [
|
||||||
|
'm.room.join_rules',
|
||||||
|
'm.room.guest_access',
|
||||||
|
'm.room.history_visibility',
|
||||||
|
'm.room.encryption',
|
||||||
|
];
|
||||||
if (refreshWhenTypes.includes(e.getType())) this.forceUpdate();
|
if (refreshWhenTypes.includes(e.getType())) this.forceUpdate();
|
||||||
};
|
};
|
||||||
|
|
||||||
_onEncryptionChange = (e) => {
|
_onEncryptionChange = (e) => {
|
||||||
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
|
MatrixClientPeg.get().sendStateEvent(
|
||||||
Modal.createTrackedDialog('E2E Enable Warning', '', QuestionDialog, {
|
|
||||||
title: _t('Warning!'),
|
|
||||||
description: (
|
|
||||||
<div>
|
|
||||||
<p>{ _t('End-to-end encryption is in beta and may not be reliable') }.</p>
|
|
||||||
<p>{ _t('You should not yet trust it to secure data') }.</p>
|
|
||||||
<p>{ _t('Devices will not yet be able to decrypt history from before they joined the room') }.</p>
|
|
||||||
<p>{ _t('Once encryption is enabled for a room it cannot be turned off again (for now)') }.</p>
|
|
||||||
<p>{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.</p>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
onFinished: (confirm)=>{
|
|
||||||
if (confirm) {
|
|
||||||
return MatrixClientPeg.get().sendStateEvent(
|
|
||||||
this.props.roomId, "m.room.encryption",
|
this.props.roomId, "m.room.encryption",
|
||||||
{ algorithm: "m.megolm.v1.aes-sha2" },
|
{ algorithm: "m.megolm.v1.aes-sha2" },
|
||||||
);
|
);
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
_fixGuestAccess = (e) => {
|
_fixGuestAccess = (e) => {
|
||||||
|
|
|
@ -442,6 +442,7 @@
|
||||||
"Flair": "Flair",
|
"Flair": "Flair",
|
||||||
"General": "General",
|
"General": "General",
|
||||||
"Room Addresses": "Room Addresses",
|
"Room Addresses": "Room Addresses",
|
||||||
|
"Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
|
||||||
"URL Previews": "URL Previews",
|
"URL Previews": "URL Previews",
|
||||||
"Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
|
"Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
|
||||||
"Success": "Success",
|
"Success": "Success",
|
||||||
|
@ -515,11 +516,6 @@
|
||||||
"To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
|
"To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
|
||||||
"Roles & Permissions": "Roles & Permissions",
|
"Roles & Permissions": "Roles & Permissions",
|
||||||
"Permissions": "Permissions",
|
"Permissions": "Permissions",
|
||||||
"End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
|
|
||||||
"You should not yet trust it to secure data": "You should not yet trust it to secure data",
|
|
||||||
"Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
|
|
||||||
"Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
|
|
||||||
"Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
|
|
||||||
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
|
"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",
|
"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.",
|
"To link to this room, please add an alias.": "To link to this room, please add an alias.",
|
||||||
|
@ -752,7 +748,6 @@
|
||||||
"Favourite": "Favourite",
|
"Favourite": "Favourite",
|
||||||
"Tagged as: ": "Tagged as: ",
|
"Tagged as: ": "Tagged as: ",
|
||||||
"To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
|
"To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
|
||||||
"Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
|
|
||||||
"Internal room ID: ": "Internal room ID: ",
|
"Internal room ID: ": "Internal room ID: ",
|
||||||
"Room version number: ": "Room version number: ",
|
"Room version number: ": "Room version number: ",
|
||||||
"Add a topic": "Add a topic",
|
"Add a topic": "Add a topic",
|
||||||
|
|
Loading…
Reference in a new issue