matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Reinstate missing sections from the UserSettings

Browse Source 
The 'devices' and 'cryptography' sections got removed from UserSettings by #566.
This commit is contained in:
Richard van der Hoff
2016-11-23 10:56:16 +00:00
parent 6842544cd7
commit 6e6bcf8b78
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,10 +338,6 @@ module.exports = React.createClass({
}, },
_renderCryptoInfo: function() { _renderCryptoInfo: function() {
if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
return null;
}
var client = MatrixClientPeg.get(); var client = MatrixClientPeg.get();
var deviceId = client.deviceId; var deviceId = client.deviceId;
var identityKey = client.getDeviceEd25519Key() || "<not supported>"; var identityKey = client.getDeviceEd25519Key() || "<not supported>";
@@ -362,9 +358,6 @@ module.exports = React.createClass({
}, },
_renderDevicesPanel: function() { _renderDevicesPanel: function() {
if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
return null;
}
var DevicesPanel = sdk.getComponent('settings.DevicesPanel'); var DevicesPanel = sdk.getComponent('settings.DevicesPanel');
return ( return (
<div> <div>