mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-16 00:41:31 +03:00
Hide world readable history option in encrypted rooms
Signed-off-by: Robin Townsend <robin@robin.town>
This commit is contained in:
parent
11ee3c752f
commit
bd602e7089
2 changed files with 30 additions and 24 deletions
|
@ -324,6 +324,33 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
|
||||||
const state = client.getRoom(this.props.roomId).currentState;
|
const state = client.getRoom(this.props.roomId).currentState;
|
||||||
const canChangeHistory = state.mayClientSendStateEvent('m.room.history_visibility', client);
|
const canChangeHistory = state.mayClientSendStateEvent('m.room.history_visibility', client);
|
||||||
|
|
||||||
|
const options = [
|
||||||
|
{
|
||||||
|
value: HistoryVisibility.Shared,
|
||||||
|
disabled: !canChangeHistory,
|
||||||
|
label: _t('Members only (since the point in time of selecting this option)'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: HistoryVisibility.Invited,
|
||||||
|
disabled: !canChangeHistory,
|
||||||
|
label: _t('Members only (since they were invited)'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: HistoryVisibility.Joined,
|
||||||
|
disabled: !canChangeHistory,
|
||||||
|
label: _t('Members only (since they joined)'),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
// World readable doesn't make sense for encrypted rooms
|
||||||
|
if (!this.state.encrypted || history === HistoryVisibility.WorldReadable) {
|
||||||
|
options.unshift({
|
||||||
|
value: HistoryVisibility.WorldReadable,
|
||||||
|
disabled: !canChangeHistory,
|
||||||
|
label: _t("Anyone"),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
|
@ -334,28 +361,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
|
||||||
name="historyVis"
|
name="historyVis"
|
||||||
value={history}
|
value={history}
|
||||||
onChange={this.onHistoryRadioToggle}
|
onChange={this.onHistoryRadioToggle}
|
||||||
definitions={[
|
definitions={options}
|
||||||
{
|
|
||||||
value: HistoryVisibility.WorldReadable,
|
|
||||||
disabled: !canChangeHistory,
|
|
||||||
label: _t("Anyone"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: HistoryVisibility.Shared,
|
|
||||||
disabled: !canChangeHistory,
|
|
||||||
label: _t('Members only (since the point in time of selecting this option)'),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: HistoryVisibility.Invited,
|
|
||||||
disabled: !canChangeHistory,
|
|
||||||
label: _t('Members only (since they were invited)'),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: HistoryVisibility.Joined,
|
|
||||||
disabled: !canChangeHistory,
|
|
||||||
label: _t('Members only (since they joined)'),
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1396,11 +1396,11 @@
|
||||||
"Only people who have been invited": "Only people who have been invited",
|
"Only people who have been invited": "Only people who have been invited",
|
||||||
"Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
|
"Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
|
||||||
"Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
|
"Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
|
||||||
"Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
|
|
||||||
"Anyone": "Anyone",
|
|
||||||
"Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
|
"Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
|
||||||
"Members only (since they were invited)": "Members only (since they were invited)",
|
"Members only (since they were invited)": "Members only (since they were invited)",
|
||||||
"Members only (since they joined)": "Members only (since they joined)",
|
"Members only (since they joined)": "Members only (since they joined)",
|
||||||
|
"Anyone": "Anyone",
|
||||||
|
"Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
|
||||||
"Who can read history?": "Who can read history?",
|
"Who can read history?": "Who can read history?",
|
||||||
"Security & Privacy": "Security & Privacy",
|
"Security & Privacy": "Security & Privacy",
|
||||||
"Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
|
"Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
|
||||||
|
|
Loading…
Reference in a new issue