OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #569 from matrix-org/rav/reinstate_devices_list 

Reinstate missing sections from the UserSettings
pull/21833/head
Richard van der Hoff 2016-11-23 11:27:59 +00:00 committed by GitHub
parent 6842544cd7 6e6bcf8b78
commit 7650e3de6e
1 changed files with 0 additions and 7 deletions
Show Stats 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>