Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Don't download E2E devices if feature disabled #418

Merged
merged 2 commits into from
Aug 17, 2016

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Aug 17, 2016

If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.

If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
// feature is enabled in the user settings
this._enableDevices = MatrixClientPeg.get().isCryptoEnabled() &&
UserSettingsStore.isFeatureEnabled("e2e_encryption");

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be in componentWillMount really, as I think you'll be be testing it and getting undefined on the first render call.

@dbkr
Copy link
Member

dbkr commented Aug 17, 2016

otherwise lgtm

@dbkr dbkr assigned richvdh and unassigned dbkr Aug 17, 2016
... to avoid referencing it in render() before it is set
@richvdh richvdh merged commit 0356f04 into develop Aug 17, 2016
@richvdh richvdh deleted the rav/no_deviceload_if_disabled branch August 17, 2016 13:41
suiluj482 added a commit to suiluj482/matrix-react-sdk that referenced this pull request Mar 6, 2024
* Add Setting "Space.showIndirectRoomsInSpace" (matrix-org#418)
* Changed SpaceFilterCondition and its tests to comply with new setting
* Changed SpaceStore to watch new setting and if updated emit event SpaceFilterCondition already listens for. Added a test for it.

Signed-off-by: Julius Schuchert <84525736+suiluj482@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants