Remove defunct "always show encryption icons" setting
It doesn't do anything in practice. Fixes https://github.com/vector-im/element-web/issues/8725
This commit is contained in:
parent
ab91ce4b2d
commit
b177843e45
4 changed files with 1 additions and 21 deletions
|
@ -394,16 +394,6 @@ $left-gutter: 64px;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_EventTile_e2eIcon_hidden {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* always override hidden attribute for blocked and warning */
|
|
||||||
.mx_EventTile_e2eIcon_hidden[src*="img/e2e-blocked.svg"],
|
|
||||||
.mx_EventTile_e2eIcon_hidden[src*="img/e2e-warning.svg"] {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_EventTile_keyRequestInfo {
|
.mx_EventTile_keyRequestInfo {
|
||||||
font-size: $font-12px;
|
font-size: $font-12px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1027,11 +1027,7 @@ class E2ePadlock extends React.Component {
|
||||||
tooltip = <Tooltip className="mx_EventTile_e2eIcon_tooltip" label={this.props.title} dir="auto" />;
|
tooltip = <Tooltip className="mx_EventTile_e2eIcon_tooltip" label={this.props.title} dir="auto" />;
|
||||||
}
|
}
|
||||||
|
|
||||||
let classes = `mx_EventTile_e2eIcon mx_EventTile_e2eIcon_${this.props.icon}`;
|
const classes = `mx_EventTile_e2eIcon mx_EventTile_e2eIcon_${this.props.icon}`;
|
||||||
if (!SettingsStore.getValue("alwaysShowEncryptionIcons")) {
|
|
||||||
classes += ' mx_EventTile_e2eIcon_hidden';
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={classes}
|
className={classes}
|
||||||
|
|
|
@ -52,7 +52,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||||
];
|
];
|
||||||
|
|
||||||
static ADVANCED_SETTINGS = [
|
static ADVANCED_SETTINGS = [
|
||||||
'alwaysShowEncryptionIcons',
|
|
||||||
'Pill.shouldShowPillAvatar',
|
'Pill.shouldShowPillAvatar',
|
||||||
'TagPanel.enableTagPanel',
|
'TagPanel.enableTagPanel',
|
||||||
'promptBeforeInviteUnknownUsers',
|
'promptBeforeInviteUnknownUsers',
|
||||||
|
|
|
@ -275,11 +275,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
|
||||||
displayName: _td('Autoplay GIFs and videos'),
|
displayName: _td('Autoplay GIFs and videos'),
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
"alwaysShowEncryptionIcons": {
|
|
||||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
|
||||||
displayName: _td('Always show encryption icons'),
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
"showRoomRecoveryReminder": {
|
"showRoomRecoveryReminder": {
|
||||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||||
displayName: _td('Show a reminder to enable Secure Message Recovery in encrypted rooms'),
|
displayName: _td('Show a reminder to enable Secure Message Recovery in encrypted rooms'),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue