From 6e6bcf8b7880d4b4c91236076696de0e01a35c2d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 23 Nov 2016 10:56:16 +0000
Subject: [PATCH] Reinstate missing sections from the UserSettings

The 'devices' and 'cryptography' sections got removed from UserSettings by #566.
---
 src/components/structures/UserSettings.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c6efc55607..b82f2f5958 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -338,10 +338,6 @@ module.exports = React.createClass({
     },
 
     _renderCryptoInfo: function() {
-        if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
-            return null;
-        }
-
         var client = MatrixClientPeg.get();
         var deviceId = client.deviceId;
         var identityKey = client.getDeviceEd25519Key() || "<not supported>";
@@ -362,9 +358,6 @@ module.exports = React.createClass({
     },
 
     _renderDevicesPanel: function() {
-        if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
-            return null;
-        }
         var DevicesPanel = sdk.getComponent('settings.DevicesPanel');
         return (
             <div>