OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Take encrypted message search out of labs 

Fixes https://github.com/vector-im/riot-web/issues/13262

This is part of the cross-signing shipping master plan. Known issues relating to this feature are:
* https://github.com/vector-im/riot-web/issues/12896
* https://github.com/vector-im/riot-web/issues/12385
* https://github.com/vector-im/riot-web/issues/11831
* https://github.com/vector-im/riot-web/issues/11155

In theory, these are issues we're comfortable with shipping as we're already enabling it by default. This just makes it easier on everyone by removing the flag (making it still enabled by default).
pull/21833/head
Travis Ralston 2020-04-22 10:58:11 -06:00
parent 355539feb5
commit fdcdd2529e
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/indexing/EventIndexPeg.js
View File

@ -37,10 +37,6 @@ class EventIndexPeg {
* EventIndex was successfully initialized, false otherwise. * EventIndex was successfully initialized, false otherwise.
*/ */
async init() { async init() {
if (!SettingsStore.isFeatureEnabled("feature_event_indexing")) {
return false;
}
const indexManager = PlatformPeg.get().getEventIndexingManager(); const indexManager = PlatformPeg.get().getEventIndexingManager();
if (!indexManager) { if (!indexManager) {
console.log("EventIndex: Platform doesn't support event indexing, not initializing."); console.log("EventIndex: Platform doesn't support event indexing, not initializing.");

6
src/settings/Settings.js
View File

@ -152,12 +152,6 @@ export const SETTINGS = {
supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here. supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
default: true, default: true,
}, },
"feature_event_indexing": {
isFeature: true,
supportedLevels: LEVELS_FEATURE,
displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
default: false,
},
"feature_bridge_state": { "feature_bridge_state": {
isFeature: true, isFeature: true,
supportedLevels: LEVELS_FEATURE, supportedLevels: LEVELS_FEATURE,