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

Convert cross-signing feature flag to setting

Browse source 
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
This commit is contained in:
Travis Ralston 2020-04-15 13:18:42 -06:00
parent 2929bcf998
commit b4e2daaf46
24 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/views/settings/tabs/user/LabsUserSettingsTab.js
View file

@ -62,6 +62,7 @@ export default class LabsUserSettingsTab extends React.Component {
</div>
<div className="mx_SettingsTab_section">
{flags}
<SettingsFlag name={"feature_cross_signing"} level={SettingLevel.DEVICE} />
<SettingsFlag name={"enableWidgetScreenshots"} level={SettingLevel.ACCOUNT} />
<SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
<SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />

2
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
View file

@ -270,7 +270,7 @@ export default class SecurityUserSettingsTab extends React.Component {
// can remove this.
const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
let crossSigning;
if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
if (SettingsStore.getValue("feature_cross_signing")) {
crossSigning = (
<div className='mx_SettingsTab_section'>
<span className="mx_SettingsTab_subheading">{_t("Cross-signing")}</span>