Merge branch 'rav/no_deviceload_if_disabled' into develop

This commit is contained in:
Richard van der Hoff 2016-08-17 14:41:18 +01:00
commit 69e8cb6f44

View file

@ -67,6 +67,11 @@ module.exports = React.createClass({
componentWillMount: function() { componentWillMount: function() {
this._cancelDeviceList = null; this._cancelDeviceList = null;
// only display the devices list if our client supports E2E *and* the
// feature is enabled in the user settings
this._enableDevices = MatrixClientPeg.get().isCryptoEnabled() &&
UserSettingsStore.isFeatureEnabled("e2e_encryption");
this.setState({ this.setState({
existingOneToOneRoomId: this.getExistingOneToOneRoomId() existingOneToOneRoomId: this.getExistingOneToOneRoomId()
}); });
@ -147,6 +152,10 @@ module.exports = React.createClass({
}, },
onDeviceVerificationChanged: function(userId, device) { onDeviceVerificationChanged: function(userId, device) {
if (!this._enableDevices) {
return;
}
if (userId == this.props.member.userId) { if (userId == this.props.member.userId) {
// no need to re-download the whole thing; just update our copy of // no need to re-download the whole thing; just update our copy of
// the list. // the list.
@ -170,6 +179,10 @@ module.exports = React.createClass({
}, },
_downloadDeviceList: function(member) { _downloadDeviceList: function(member) {
if (!this._enableDevices) {
return;
}
var cancelled = false; var cancelled = false;
this._cancelDeviceList = function() { cancelled = true; } this._cancelDeviceList = function() { cancelled = true; }
@ -532,7 +545,7 @@ module.exports = React.createClass({
}, },
_renderDevices: function() { _renderDevices: function() {
if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) { if (!this._enableDevices) {
return null; return null;
} }