imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit d714176fcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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>
);
},