From fdcdd2529e2df08db06d87f315b45790ec4afd0a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 22 Apr 2020 10:58:11 -0600 Subject: [PATCH 1/4] 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). --- .../settings/tabs/user/SecurityUserSettingsTab.js | 15 ++++++--------- src/indexing/EventIndexPeg.js | 4 ---- src/settings/Settings.js | 6 ------ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js index 1cde5d6f873..907e29baa7a 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js @@ -254,15 +254,12 @@ export default class SecurityUserSettingsTab extends React.Component { ); - let eventIndex; - if (SettingsStore.isFeatureEnabled("feature_event_indexing")) { - eventIndex = ( -
- {_t("Message search")} - -
- ); - } + let eventIndex = ( +
+ {_t("Message search")} + +
+ ); // 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 diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js index 9aa7e78edad..ae4c14dafd5 100644 --- a/src/indexing/EventIndexPeg.js +++ b/src/indexing/EventIndexPeg.js @@ -37,10 +37,6 @@ class EventIndexPeg { * EventIndex was successfully initialized, false otherwise. */ async init() { - if (!SettingsStore.isFeatureEnabled("feature_event_indexing")) { - return false; - } - const indexManager = PlatformPeg.get().getEventIndexingManager(); if (!indexManager) { console.log("EventIndex: Platform doesn't support event indexing, not initializing."); diff --git a/src/settings/Settings.js b/src/settings/Settings.js index 5e57c27c9d2..928b1985faf 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -152,12 +152,6 @@ export const SETTINGS = { supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here. 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": { isFeature: true, supportedLevels: LEVELS_FEATURE, From 5c77df2afdff6afff3c7533a4931625a072ca104 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 22 Apr 2020 11:01:07 -0600 Subject: [PATCH 2/4] i18n --- src/i18n/strings/en_EN.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 7af45003a81..2745728b63b 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -403,7 +403,6 @@ "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)", "Support adding custom themes": "Support adding custom themes", "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session", - "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)", "Show info about bridges in room settings": "Show info about bridges in room settings", "Show padlocks on invite only rooms": "Show padlocks on invite only rooms", "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing", From 3662c9e1c13e26266adb86734f9a3150c0f95faf Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 22 Apr 2020 11:05:43 -0600 Subject: [PATCH 3/4] Appease the linter --- .../views/settings/tabs/user/SecurityUserSettingsTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js index 907e29baa7a..a88f35da682 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js @@ -254,7 +254,7 @@ export default class SecurityUserSettingsTab extends React.Component { ); - let eventIndex = ( + const eventIndex = (
{_t("Message search")} From 27138b33c036bc7d23be45fac85e4a287640606a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 22 Apr 2020 11:08:46 -0600 Subject: [PATCH 4/4] Match settings paragraph style in all cases --- src/components/views/settings/EventIndexPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js index c9c6a5ec4f6..6b084c2579a 100644 --- a/src/components/views/settings/EventIndexPanel.js +++ b/src/components/views/settings/EventIndexPanel.js @@ -163,7 +163,7 @@ export default class EventIndexPanel extends React.Component { ); eventIndexingSettings = ( -
+
{ _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 = ( -
+
{ _t( "Riot can't securely cache encrypted messages locally " + "while running in a web browser. Use Riot Desktop " +