- { _t('The information being sent to us to help make Riot.im better includes:') }
+ { _t('The information being sent to us to help make Riot better includes:') }
+ {_t("Advanced")}
+
+
;
+};
+
+export default E2eAdvancedPanel;
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
new file mode 100644
index 0000000000..203a7ee46e
--- /dev/null
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -0,0 +1,201 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+
+import { _t } from '../../../languageHandler';
+import * as sdk from '../../../index';
+import Modal from '../../../Modal';
+import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import AccessibleButton from "../elements/AccessibleButton";
+import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
+import EventIndexPeg from "../../../indexing/EventIndexPeg";
+
+export default class EventIndexPanel extends React.Component {
+ constructor() {
+ super();
+
+ this.state = {
+ enabling: false,
+ eventIndexSize: 0,
+ roomCount: 0,
+ eventIndexingEnabled:
+ SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing'),
+ };
+ }
+
+ updateCurrentRoom = async (room) => {
+ const eventIndex = EventIndexPeg.get();
+ let stats;
+
+ try {
+ stats = await eventIndex.getStats();
+ } catch {
+ // This call may fail if sporadically, not a huge issue as we will
+ // try later again and probably succeed.
+ return;
+ }
+
+ this.setState({
+ eventIndexSize: stats.size,
+ roomCount: stats.roomCount,
+ });
+ };
+
+ componentWillUnmount(): void {
+ const eventIndex = EventIndexPeg.get();
+
+ if (eventIndex !== null) {
+ eventIndex.removeListener("changedCheckpoint", this.updateCurrentRoom);
+ }
+ }
+
+ async componentWillMount(): void {
+ this.updateState();
+ }
+
+ async updateState() {
+ const eventIndex = EventIndexPeg.get();
+ const eventIndexingEnabled = SettingsStore.getValueAt(SettingLevel.DEVICE, 'enableEventIndexing');
+ const enabling = false;
+
+ let eventIndexSize = 0;
+ let roomCount = 0;
+
+ if (eventIndex !== null) {
+ eventIndex.on("changedCheckpoint", this.updateCurrentRoom);
+
+ try {
+ const stats = await eventIndex.getStats();
+ eventIndexSize = stats.size;
+ roomCount = stats.roomCount;
+ } catch {
+ // This call may fail if sporadically, not a huge issue as we
+ // will try later again in the updateCurrentRoom call and
+ // probably succeed.
+ }
+ }
+
+ this.setState({
+ enabling,
+ eventIndexSize,
+ roomCount,
+ eventIndexingEnabled,
+ });
+ }
+
+ _onManage = async () => {
+ Modal.createTrackedDialogAsync('Message search', 'Message search',
+ import('../../../async-components/views/dialogs/eventindex/ManageEventIndexDialog'),
+ {
+ onFinished: () => {},
+ }, null, /* priority = */ false, /* static = */ true,
+ );
+ }
+
+ _onEnable = async () => {
+ this.setState({
+ enabling: true,
+ });
+
+ await EventIndexPeg.initEventIndex();
+ await EventIndexPeg.get().addInitialCheckpoints();
+ await EventIndexPeg.get().startCrawler();
+ await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, true);
+ await this.updateState();
+ }
+
+ render() {
+ let eventIndexingSettings = null;
+ const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+
+ if (EventIndexPeg.get() !== null) {
+ eventIndexingSettings = (
+ {_t(
+ "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.",
+ )}
+
+
+ );
+ } else if (!this.state.eventIndexingEnabled && EventIndexPeg.supportIsInstalled()) {
+ eventIndexingSettings = (
+
+ {_t( "Securely cache encrypted messages locally for them " +
+ "to appear in search results, using ")
+ } {formatBytes(this.state.eventIndexSize, 0)}
+ {_t( " to store messages from ")}
+ {formatCountLong(this.state.roomCount)} {_t("rooms.")}
+
+
+
+ {_t("Manage")}
+
+
+
+
+ );
+ } else if (EventIndexPeg.platformHasSupport() && !EventIndexPeg.supportIsInstalled()) {
+ const nativeLink = (
+ "https://github.com/vector-im/riot-web/blob/develop/" +
+ "docs/native-node-modules.md#" +
+ "adding-seshat-for-search-in-e2e-encrypted-rooms"
+ );
+
+ eventIndexingSettings = (
+
+ {_t( "Securely cache encrypted messages locally for them to " +
+ "appear in search results.")}
+
+
+
+ {_t("Enable")}
+
+ {this.state.enabling ?
+
+ {
+ _t( "Riot is missing some components required for securely " +
+ "caching encrypted messages locally. If you'd like to " +
+ "experiment with this feature, build a custom Riot Desktop " +
+ "with search components added .",
+ {},
+ {
+ 'nativeLink': (sub) => {sub},
+ },
+ )
+ }
+
+ );
+ } else {
+ eventIndexingSettings = (
+
+ {
+ _t( "Riot can't securely cache encrypted messages locally " +
+ "while running in a web browser. Use Riot Desktop " +
+ "for encrypted messages to appear in search results.",
+ {},
+ {
+ 'riotLink': (sub) => {sub},
+ },
+ )
+ }
+
+ );
+ }
+
+ return eventIndexingSettings;
+ }
+}
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 07cb02bd8e..27fdb2cb56 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,19 +127,6 @@ export default class KeyBackupPanel extends React.PureComponent {
Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
{
- secureSecretStorage: false,
- onFinished: () => {
- this._loadBackupStatus();
- },
- }, null, /* priority = */ false, /* static = */ true,
- );
- }
-
- _startNewBackupWithSecureSecretStorage = async () => {
- Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
- import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
- {
- secureSecretStorage: true,
onFinished: () => {
this._loadBackupStatus();
},
@@ -198,23 +185,23 @@ export default class KeyBackupPanel extends React.PureComponent {
if (MatrixClientPeg.get().getKeyBackupEnabled()) {
clientBackupStatus = {encryptedMessageAreEncrypted}
-✅ {_t("This device is backing up your keys. ")}
+✅ {_t("This session is backing up your keys. ")}
{encryptedMessageAreEncrypted}
{_t( - "This device is not backing up your keys, " + + "This session is not backing up your keys, " + "but you do have an existing backup you can restore from " + "and add to going forward.", {}, {b: sub => {sub}}, )}
{_t( - "Connect this device to key backup before signing out to avoid " + - "losing any keys that may only be on this device.", + "Connect this session to key backup before signing out to avoid " + + "losing any keys that may only be on this session.", )}
⚠️ {_t( "Backup key stored in secret storage, but this feature is not " + - "enabled on this device. Please enable cross-signing in Labs to " + + "enabled on this session. Please enable cross-signing in Labs to " + "modify key backup state.", )}
; } @@ -361,26 +348,10 @@ export default class KeyBackupPanel extends React.PureComponent { {buttonRow} ; } else { - // This is a temporary button for testing the new path which stores - // the key backup key in SSSS. Initialising SSSS depends on - // cross-signing and is part of the same project, so we only show - // this mode when the cross-signing feature is enabled. - // TODO: Clean this up when removing the feature flag. - let secureSecretStorageKeyBackup; - if (SettingsStore.isFeatureEnabled("feature_cross_signing")) { - secureSecretStorageKeyBackup = ( -
-
- {_t("Start using Key Backup with Secure Secret Storage")}
-
-
- );
- }
-
return {_t( - "Your keys are not being backed up from this device.", {}, + "Your keys are not being backed up from this session.", {}, {b: sub => {sub}}, )}
{encryptedMessageAreEncrypted}
@@ -391,7 +362,6 @@ export default class KeyBackupPanel extends React.PureComponent { {_t("Start using Key Backup")}![]({require("../../../../res/img/external-link.svg")}){kind=small}
;
@@ -153,7 +153,7 @@ export default class ProfileSettings extends React.Component {
{this.state.userId}
{hostingSignup}
-