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

Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons

Browse source 
Remove defunct "always show encryption icons" setting
This commit is contained in:
Travis Ralston 2020-09-15 08:52:19 -06:00 • committed by GitHub
commit d11ce5fade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/EventTile.js
View file

@ -1027,11 +1027,7 @@ class E2ePadlock extends React.Component {
tooltip = <Tooltip className="mx_EventTile_e2eIcon_tooltip" label={this.props.title} dir="auto" />;
}
let classes = `mx_EventTile_e2eIcon mx_EventTile_e2eIcon_${this.props.icon}`;
if (!SettingsStore.getValue("alwaysShowEncryptionIcons")) {
classes += ' mx_EventTile_e2eIcon_hidden';
}
const classes = `mx_EventTile_e2eIcon mx_EventTile_e2eIcon_${this.props.icon}`;
return (
<div
className={classes}

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

@ -52,7 +52,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
];
static ADVANCED_SETTINGS = [
'alwaysShowEncryptionIcons',
'Pill.shouldShowPillAvatar',
'TagPanel.enableTagPanel',
'promptBeforeInviteUnknownUsers',