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

Merge pull request #2169 from matrix-org/dbkr/e2e_backups

Browse Source 
Online incremental megolm backups (v2)
This commit is contained in:
David Baker
2018-11-21 18:37:43 +00:00
committed by GitHub
parent 3529482be5 b529c98095
commit d714176fcd
15 changed files with 1251 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,6 +737,16 @@ module.exports = React.createClass({
</div>
);
}
let keyBackupSection;
if (SettingsStore.isFeatureEnabled("feature_keybackup")) {
const KeyBackupPanel = sdk.getComponent('views.settings.KeyBackupPanel');
keyBackupSection = <div className="mx_UserSettings_section">
<h3>{ _t("Key Backup") }</h3>
<KeyBackupPanel />
</div>;
}
return (
<div>
<h3>{ _t("Cryptography") }</h3>
@ -752,6 +762,7 @@ module.exports = React.createClass({
<div className="mx_UserSettings_section">
{ CRYPTO_SETTINGS.map( this._renderDeviceSetting ) }
</div>
{keyBackupSection}
</div>
);
},