matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

MemberInfo: initialise _enableDevices in componentWillMount

Browse Source 
... to avoid referencing it in render() before it is set
This commit is contained in:
Richard van der Hoff
2016-08-17 14:40:10 +01:00
parent 30168a1b9c
commit 0356f04b9c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/rooms/MemberInfo.js
View File

@@ -67,17 +67,17 @@ 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()
}); });
}, },
componentDidMount: function() { componentDidMount: function() {
// 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._updateStateForNewMember(this.props.member); this._updateStateForNewMember(this.props.member);
MatrixClientPeg.get().on("deviceVerificationChanged", this.onDeviceVerificationChanged); MatrixClientPeg.get().on("deviceVerificationChanged", this.onDeviceVerificationChanged);
}, },