matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Avoid clearing e2e encryption keys, also avoid warning

Browse Source
This commit is contained in:
Bruno Windels
2018-08-13 17:24:27 +02:00
parent 08f322753d
commit 7dc92fe917
3 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/structures/UserSettings.js
View File

@ -887,12 +887,12 @@ module.exports = React.createClass({
},
_onLazyLoadChanging: async function(enabling) {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
// don't prevent turning LL off when not supported
if (enabling) {
const supported = await MatrixClientPeg.get().doesServerSupportLazyLoading();
if (!supported) {
await new Promise((resolve) => {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createDialog(QuestionDialog, {
title: _t("Lazy loading members not supported"),
description:
@ -907,28 +907,7 @@ module.exports = React.createClass({
return false;
}
}
const confirmed = await new Promise((resolve) => {
Modal.createDialog(QuestionDialog, {
title: _t("Turn on/off lazy load members"),
description:
<div>
{ _t("To enable or disable the lazy loading of members, " +
"the current synced state needs to be cleared out. " +
"This also includes your end-to-end encryption keys, " +
"so to keep being able to decrypt all your existing encrypted messages, " +
"you'll need to export your E2E room keys and import them again afterwards.") }
</div>,
button: _t("Clear sync state and reload"),
extraButtons: [
<button key="export" className="mx_Dialog_primary"
onClick={this._onExportE2eKeysClicked}>
{ _t("Export E2E room keys") }
</button>,
],
onFinished: resolve,
});
});
return confirmed;
return true;
},
_renderDeactivateAccount: function() {