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

Get rid of always-on labs settings

Browse source 
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
This commit is contained in:
Richard van der Hoff 2016-11-21 10:25:48 +00:00
parent 2e691240ae
commit 4476b09ce7
4 changed files with 28 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/rooms/MemberInfo.js
View file

@ -30,7 +30,6 @@ var classNames = require('classnames');
var dis = require("../../../dispatcher");
var Modal = require("../../../Modal");
var sdk = require('../../../index');
var UserSettingsStore = require('../../../UserSettingsStore');
var createRoom = require('../../../createRoom');
var DMRoomMap = require('../../../utils/DMRoomMap');
var Unread = require('../../../Unread');
@ -71,10 +70,8 @@ module.exports = WithMatrixClient(React.createClass({
componentWillMount: function() {
this._cancelDeviceList = null;
// only display the devices list if our client supports E2E *and* the
// feature is enabled in the user settings
this._enableDevices = this.props.matrixClient.isCryptoEnabled() &&
UserSettingsStore.isFeatureEnabled("e2e_encryption");
// only display the devices list if our client supports E2E
this._enableDevices = this.props.matrixClient.isCryptoEnabled();
const cli = this.props.matrixClient;
cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);