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

Merge pull request #4467 from matrix-org/travis/seshat-enable

Browse source 
Take encrypted message search out of labs
This commit is contained in:
J. Ryan Stinnett 2020-04-23 10:21:58 +01:00 • committed by GitHub
commit 4a0f228714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/settings/EventIndexPanel.js
View file

@ -163,7 +163,7 @@ export default class EventIndexPanel extends React.Component {
);
eventIndexingSettings = (
<div>
<div className='mx_SettingsTab_subsectionText'>
{
_t( "Riot is missing some components required for securely " +
"caching encrypted messages locally. If you'd like to " +
@ -180,7 +180,7 @@ export default class EventIndexPanel extends React.Component {
);
} else {
eventIndexingSettings = (
<div>
<div className='mx_SettingsTab_subsectionText'>
{
_t( "Riot can't securely cache encrypted messages locally " +
"while running in a web browser. Use <riotLink>Riot Desktop</riotLink> " +

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

@ -282,15 +282,12 @@ export default class SecurityUserSettingsTab extends React.Component {
</div>
);
let eventIndex;
if (SettingsStore.isFeatureEnabled("feature_event_indexing")) {
eventIndex = (
<div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
<EventIndexPanel />
</div>
);
}
const eventIndex = (
<div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Message search")}</span>
<EventIndexPanel />
</div>
);
// XXX: There's no such panel in the current cross-signing designs, but
// it's useful to have for testing the feature. If there's no interest