- { title }
- { subtitle }
- { description }
-
- );
- }
+export const TextualCompletion = forwardRef
+ { title }
+ { subtitle }
+ { description }
+
+ );
+});
+
+interface IPillCompletionProps extends ITextualCompletionProps {
+ children?: React.ReactNode,
}
-interface IPillCompletionProps {
- title?: string;
- subtitle?: string;
- description?: string;
- initialComponent?: React.ReactNode,
- className?: string;
-}
-
-export class PillCompletion extends React.PureComponent
- { initialComponent }
- { title }
- { subtitle }
- { description }
-
- );
- }
-}
+export const PillCompletion = forwardRef
+ { children }
+ { title }
+ { subtitle }
+ { description }
+
+ );
+});
diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index 3a3cec779e..e1e02fcf87 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -121,9 +121,9 @@ export default class EmojiProvider extends AutocompleteProvider {
return {
completion: unicode,
component: (
- ![]({require("../../../res/img/feather-customised/warning-triangle.svg")} "{_t(\"Warning\")}"){kind=small}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c87f4cc4dd..49d7e3c238 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -879,15 +879,6 @@ export default createReactClass({
});
return;
}
- if (!SettingsStore.getValue("feature_cross_signing")) {
- room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
- this.setState({
- e2eStatus: hasUnverifiedDevices ? "warning" : "verified",
- });
- });
- debuglog("e2e check is warning/verified only as cross-signing is off");
- return;
- }
/* At this point, the user has encryption on and cross-signing on */
this.setState({
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index cc308a834b..87fbf3de02 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -24,7 +24,6 @@ import withValidation from '../elements/Validation';
import { _t } from '../../../languageHandler';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import {Key} from "../../../Keyboard";
-import SettingsStore from "../../../settings/SettingsStore";
export default createReactClass({
displayName: 'CreateRoomDialog',
@@ -66,7 +65,7 @@ export default createReactClass({
createOpts.creation_content = {'m.federate': false};
}
- if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
+ if (!this.state.isPublic) {
opts.encryption = this.state.isEncrypted;
}
@@ -193,7 +192,7 @@ export default createReactClass({
}
let e2eeSection;
- if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
+ if (!this.state.isPublic) {
e2eeSection =
-
-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 PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import * as FormattingUtils from '../../../utils/FormattingUtils';
-import { _t } from '../../../languageHandler';
-import {verificationMethods} from 'matrix-js-sdk/src/crypto';
-import {ensureDMExists} from "../../../createRoom";
-import dis from "../../../dispatcher/dispatcher";
-import SettingsStore from '../../../settings/SettingsStore';
-import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
-import VerificationQREmojiOptions from "../verification/VerificationQREmojiOptions";
-
-const MODE_LEGACY = 'legacy';
-const MODE_SAS = 'sas';
-
-const PHASE_START = 0;
-const PHASE_WAIT_FOR_PARTNER_TO_ACCEPT = 1;
-const PHASE_PICK_VERIFICATION_OPTION = 2;
-const PHASE_SHOW_SAS = 3;
-const PHASE_WAIT_FOR_PARTNER_TO_CONFIRM = 4;
-const PHASE_VERIFIED = 5;
-const PHASE_CANCELLED = 6;
-
-export default class DeviceVerifyDialog extends React.Component {
- static propTypes = {
- userId: PropTypes.string.isRequired,
- device: PropTypes.object.isRequired,
- onFinished: PropTypes.func.isRequired,
- };
-
- constructor() {
- super();
- this._verifier = null;
- this._showSasEvent = null;
- this._request = null;
- this.state = {
- phase: PHASE_START,
- mode: MODE_SAS,
- sasVerified: false,
- };
- }
-
- componentWillUnmount() {
- if (this._verifier) {
- this._verifier.removeListener('show_sas', this._onVerifierShowSas);
- this._verifier.cancel('User cancel');
- }
- }
-
- _onSwitchToLegacyClick = () => {
- if (this._verifier) {
- this._verifier.removeListener('show_sas', this._onVerifierShowSas);
- this._verifier.cancel('User cancel');
- this._verifier = null;
- }
- this.setState({mode: MODE_LEGACY});
- }
-
- _onSwitchToSasClick = () => {
- this.setState({mode: MODE_SAS});
- }
-
- _onCancelClick = () => {
- this.props.onFinished(false);
- }
-
- _onUseSasClick = async () => {
- try {
- this._verifier = this._request.beginKeyVerification(verificationMethods.SAS);
- this._verifier.on('show_sas', this._onVerifierShowSas);
- // throws upon cancellation
- await this._verifier.verify();
- this.setState({phase: PHASE_VERIFIED});
- this._verifier.removeListener('show_sas', this._onVerifierShowSas);
- this._verifier = null;
- } catch (e) {
- console.log("Verification failed", e);
- this.setState({
- phase: PHASE_CANCELLED,
- });
- this._verifier = null;
- this._request = null;
- }
- };
-
- _onLegacyFinished = (confirm) => {
- if (confirm) {
- MatrixClientPeg.get().setDeviceVerified(
- this.props.userId, this.props.device.deviceId, true,
- );
- }
- this.props.onFinished(confirm);
- }
-
- _onSasRequestClick = async () => {
- this.setState({
- phase: PHASE_WAIT_FOR_PARTNER_TO_ACCEPT,
- });
- const client = MatrixClientPeg.get();
- const verifyingOwnDevice = this.props.userId === client.getUserId();
- try {
- if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
- const roomId = await ensureDMExistsAndOpen(this.props.userId);
- // throws upon cancellation before having started
- const request = await client.requestVerificationDM(
- this.props.userId, roomId,
- );
- await request.waitFor(r => r.ready || r.started);
- if (request.ready) {
- this._verifier = request.beginKeyVerification(verificationMethods.SAS);
- } else {
- this._verifier = request.verifier;
- }
- } else if (verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
- this._request = await client.requestVerification(this.props.userId, [
- verificationMethods.SAS,
- SHOW_QR_CODE_METHOD,
- verificationMethods.RECIPROCATE_QR_CODE,
- ]);
-
- await this._request.waitFor(r => r.ready || r.started);
- this.setState({phase: PHASE_PICK_VERIFICATION_OPTION});
- } else {
- this._verifier = client.beginKeyVerification(
- verificationMethods.SAS, this.props.userId, this.props.device.deviceId,
- );
- }
- if (!this._verifier) return;
- this._verifier.on('show_sas', this._onVerifierShowSas);
- // throws upon cancellation
- await this._verifier.verify();
- this.setState({phase: PHASE_VERIFIED});
- this._verifier.removeListener('show_sas', this._onVerifierShowSas);
- this._verifier = null;
- } catch (e) {
- console.log("Verification failed", e);
- this.setState({
- phase: PHASE_CANCELLED,
- });
- this._verifier = null;
- }
- }
-
- _onSasMatchesClick = () => {
- this._showSasEvent.confirm();
- this.setState({
- phase: PHASE_WAIT_FOR_PARTNER_TO_CONFIRM,
- });
- }
-
- _onVerifiedDoneClick = () => {
- this.props.onFinished(true);
- }
-
- _onVerifierShowSas = (e) => {
- this._showSasEvent = e;
- this.setState({
- phase: PHASE_SHOW_SAS,
- });
- }
-
- _renderSasVerification() {
- let body;
- switch (this.state.phase) {
- case PHASE_START:
- body = this._renderVerificationPhaseStart();
- break;
- case PHASE_WAIT_FOR_PARTNER_TO_ACCEPT:
- body = this._renderVerificationPhaseWaitAccept();
- break;
- case PHASE_PICK_VERIFICATION_OPTION:
- body = this._renderVerificationPhasePick();
- break;
- case PHASE_SHOW_SAS:
- body = this._renderSasVerificationPhaseShowSas();
- break;
- case PHASE_WAIT_FOR_PARTNER_TO_CONFIRM:
- body = this._renderSasVerificationPhaseWaitForPartnerToConfirm();
- break;
- case PHASE_VERIFIED:
- body = this._renderVerificationPhaseVerified();
- break;
- case PHASE_CANCELLED:
- body = this._renderVerificationPhaseCancelled();
- break;
- }
-
- const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
- return (
-
- {body}
-
- );
- }
-
- _renderVerificationPhaseStart() {
- const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
- const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
- return (
-
- ,
- );
-
- return
-
- );
- // XXX: do we want to give the user the option to enable blacklistUnverifiedDevices for this room (or globally) at this point?
- // It feels like confused users will likely turn it on and then disappear in a cloud of UISIs...
- },
-});
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 2f4c524ed7..6addabd00d 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -20,10 +20,8 @@ import PropTypes from 'prop-types';
import * as sdk from '../../../../index';
import {MatrixClientPeg} from '../../../../MatrixClientPeg';
import { MatrixClient } from 'matrix-js-sdk';
-import Modal from '../../../../Modal';
import { _t } from '../../../../languageHandler';
import { accessSecretStorage } from '../../../../CrossSigningManager';
-import SettingsStore from "../../../../settings/SettingsStore";
const RESTORE_TYPE_PASSPHRASE = 0;
const RESTORE_TYPE_RECOVERYKEY = 1;
@@ -90,21 +88,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
_onResetRecoveryClick = () => {
this.props.onFinished(false);
-
- if (SettingsStore.getValue("feature_cross_signing")) {
- // If cross-signing is enabled, we reset the SSSS recovery passphrase (and cross-signing keys)
- this.props.onFinished(false);
- accessSecretStorage(() => {}, {forceReset: true});
- } else {
- Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
- import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
- {
- onFinished: () => {
- this._loadBackupStatus();
- },
- }, null, /* priority = */ false, /* static = */ true,
- );
- }
+ accessSecretStorage(() => {}, {forceReset: true});
}
_onRecoveryKeyChange = (e) => {
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
deleted file mode 100644
index 7328d50328..0000000000
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-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 PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
-
-// XXX: This component is *not* cross-signing aware. Once everything is
-// cross-signing, this component should just go away.
-export default createReactClass({
- displayName: 'DeviceVerifyButtons',
-
- propTypes: {
- userId: PropTypes.string.isRequired,
- device: PropTypes.object.isRequired,
- },
-
- getInitialState: function() {
- return {
- device: this.props.device,
- };
- },
-
- componentDidMount: function() {
- const cli = MatrixClientPeg.get();
- cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
- },
-
- componentWillUnmount: function() {
- const cli = MatrixClientPeg.get();
- if (cli) {
- cli.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
- }
- },
-
- onDeviceVerificationChanged: function(userId, deviceId, deviceInfo) {
- if (userId === this.props.userId && deviceId === this.props.device.deviceId) {
- this.setState({ device: deviceInfo });
- }
- },
-
- onVerifyClick: function() {
- const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
- Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
- userId: this.props.userId,
- device: this.state.device,
- }, null, /* priority = */ false, /* static = */ true);
- },
-
- onUnverifyClick: function() {
- MatrixClientPeg.get().setDeviceVerified(
- this.props.userId, this.state.device.deviceId, false,
- );
- },
-
- onBlacklistClick: function() {
- MatrixClientPeg.get().setDeviceBlocked(
- this.props.userId, this.state.device.deviceId, true,
- );
- },
-
- onUnblacklistClick: function() {
- MatrixClientPeg.get().setDeviceBlocked(
- this.props.userId, this.state.device.deviceId, false,
- );
- },
-
- render: function() {
- let blacklistButton = null; let verifyButton = null;
-
- if (this.state.device.isBlocked()) {
- blacklistButton = (
-
- );
- } else {
- blacklistButton = (
-
- );
- }
-
- if (this.state.device.isVerified()) {
- verifyButton = (
-
- );
- } else {
- verifyButton = (
-
- );
- }
-
- return (
-
- { this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community') }
-
- );
-
- // No make/revoke admin API yet
- /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
- giveModButton =
- {giveOpLabel}
- ;*/
-
- if (kickButton) {
- adminTools =
- {
autocompleter: Autocompleter;
queryRequested: string;
debounceCompletionsRequest: NodeJS.Timeout;
- containerRef: React.RefObject;
+ private containerRef = createRef();
constructor(props) {
super(props);
@@ -78,8 +77,6 @@ export default class Autocomplete extends React.PureComponent {
forceComplete: false,
};
-
- this.containerRef = React.createRef();
}
componentDidMount() {
@@ -256,14 +253,15 @@ export default class Autocomplete extends React.PureComponent {
componentDidUpdate(prevProps: IProps) {
this.applyNewProps(prevProps.query, prevProps.room);
// this is the selected completion, so scroll it into view if needed
- const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];
- if (selectedCompletion && this.containerRef.current) {
- const domNode = ReactDOM.findDOMNode(selectedCompletion);
- const offsetTop = domNode && (domNode as HTMLElement).offsetTop;
- if (offsetTop > this.containerRef.current.scrollTop + this.containerRef.current.offsetHeight ||
- offsetTop < this.containerRef.current.scrollTop) {
- this.containerRef.current.scrollTop = offsetTop - this.containerRef.current.offsetTop;
- }
+ const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`] as HTMLElement;
+
+ if (selectedCompletion) {
+ selectedCompletion.scrollIntoView({
+ behavior: "auto",
+ block: "nearest",
+ });
+ } else {
+ this.containerRef.current.scrollTo({ top: 0 });
}
}
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 5e74656920..bf65c7fb7c 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -20,7 +20,6 @@ import PropTypes from "prop-types";
import classNames from 'classnames';
import {_t, _td} from '../../../languageHandler';
-import {useSettingValue} from "../../../hooks/useSettings";
import AccessibleButton from "../elements/AccessibleButton";
import Tooltip from "../elements/Tooltip";
@@ -42,15 +41,6 @@ const crossSigningRoomTitles = {
[E2E_STATE.VERIFIED]: _td("Everyone in this room is verified"),
};
-const legacyUserTitles = {
- [E2E_STATE.WARNING]: _td("Some sessions for this user are not trusted"),
- [E2E_STATE.VERIFIED]: _td("All sessions for this user are trusted"),
-};
-const legacyRoomTitles = {
- [E2E_STATE.WARNING]: _td("Some sessions in this encrypted room are not trusted"),
- [E2E_STATE.VERIFIED]: _td("All sessions in this encrypted room are trusted"),
-};
-
const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
const [hover, setHover] = useState(false);
@@ -62,15 +52,10 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
}, className);
let e2eTitle;
- const crossSigning = useSettingValue("feature_cross_signing");
- if (crossSigning && isUser) {
+ if (isUser) {
e2eTitle = crossSigningUserTitles[status];
- } else if (crossSigning && !isUser) {
+ } else {
e2eTitle = crossSigningRoomTitles[status];
- } else if (!crossSigning && isUser) {
- e2eTitle = legacyUserTitles[status];
- } else if (!crossSigning && !isUser) {
- e2eTitle = legacyRoomTitles[status];
}
let style;
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a822875a18..ee382e7045 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -325,15 +325,6 @@ export default createReactClass({
return;
}
- // If cross-signing is off, the old behaviour is to scream at the user
- // as if they've done something wrong, which they haven't
- if (!SettingsStore.getValue("feature_cross_signing")) {
- this.setState({
- verified: E2E_STATE.WARNING,
- }, this.props.onHeightChanged);
- return;
- }
-
if (!this.context.checkUserTrust(mxEvent.getSender()).isCrossSigningVerified()) {
this.setState({
verified: E2E_STATE.NORMAL,
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
deleted file mode 100644
index dbf0ae0c62..0000000000
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-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 PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import classNames from 'classnames';
-
-export default class MemberDeviceInfo extends React.Component {
- render() {
- const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
- // XXX: These checks are not cross-signing aware but this component is only used
- // from the old, pre-cross-signing memberinfopanel
- const iconClasses = classNames({
- mx_MemberDeviceInfo_icon: true,
- mx_MemberDeviceInfo_icon_blacklisted: this.props.device.isBlocked(),
- mx_MemberDeviceInfo_icon_verified: this.props.device.isVerified(),
- mx_MemberDeviceInfo_icon_unverified: this.props.device.isUnverified(),
- });
- const indicator = ();
- const deviceName = (this.props.device.ambiguous || this.props.showDeviceId) ?
- (this.props.device.getDisplayName() ? this.props.device.getDisplayName() : "") + " (" + this.props.device.deviceId + ")" :
- this.props.device.getDisplayName();
-
- // add the deviceId as a titletext to help with debugging
- return (
-
- { this.state.isIgnoring ? _t("Unignore") : _t("Ignore") }
-
- );
-
- if (member.roomId) {
- const room = cli.getRoom(member.roomId);
- const eventId = room.getEventReadUpTo(member.userId);
-
- const onReadReceiptButton = function() {
- dis.dispatch({
- action: 'view_room',
- highlighted: true,
- event_id: eventId,
- room_id: member.roomId,
- });
- };
-
- const onInsertPillButton = function() {
- dis.dispatch({
- action: 'insert_mention',
- user_id: member.userId,
- });
- };
-
- readReceiptButton = (
-
- { _t('Jump to read receipt') }
-
- );
-
- insertPillButton = (
-
- { _t('Mention') }
-
- );
- }
-
- if (this.state.can.invite && (!member || !member.membership || member.membership === 'leave')) {
- const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
- const onInviteUserButton = async () => {
- try {
- // We use a MultiInviter to re-use the invite logic, even though
- // we're only inviting one user.
- const inviter = new MultiInviter(roomId);
- await inviter.invite([member.userId]).then(() => {
- if (inviter.getCompletionState(member.userId) !== "invited")
- throw new Error(inviter.getErrorText(member.userId));
- });
- } catch (err) {
- const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
- Modal.createTrackedDialog('Failed to invite', '', ErrorDialog, {
- title: _t('Failed to invite'),
- description: ((err && err.message) ? err.message : _t("Operation failed")),
- });
- }
- };
-
- inviteUserButton = (
-
- { _t('Invite') }
-
- );
- }
- }
-
- const shareUserButton = (
-
- { _t('Share Link to User') }
-
- );
-
- return (
-
- ;
-
- if (tiles.length > 0) startNewChat = null; // Don't offer a button for a new chat if we have one.
-
- startChat =
- { kickLabel }
-
- );
- }
-
- if (this.state.can.redactMessages) {
- redactButton = (
-
- { _t("Remove recent messages") }
-
- );
- }
-
- if (this.state.can.ban) {
- let label = _t("Ban");
- if (this.props.member.membership === 'ban') {
- label = _t("Unban");
- }
- banButton = (
-
- { label }
-
- );
- }
- if (this.state.can.mute) {
- const muteLabel = this.state.muted ? _t("Unmute") : _t("Mute");
- muteButton = (
-
- { muteLabel }
-
- );
- }
- if (this.state.can.toggleMod) {
- const giveOpLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
- giveModButton =
- { giveOpLabel }
- ;
- }
-
- // We don't need a perfect check here, just something to pass as "probably not our homeserver". If
- // someone does figure out how to bypass this check the worst that happens is an error.
- const sameHomeserver = this.props.member.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`);
- if (this.state.can.synapseDeactivate && sameHomeserver) {
- synapseDeactivateButton = (
-
- {_t("Deactivate user")}
-
- );
- }
-
- let adminTools;
- if (kickButton || banButton || muteButton || giveModButton || synapseDeactivateButton || redactButton) {
- adminTools =
-
);
}
+
+ // TODO: determine how better to expose this to users in addition to prompts at login/toast
let bootstrapButton;
if (
(!enabledForAccount || !crossSigningPublicKeysOnDevice) &&
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index fa3fa03c74..a7a2c768db 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,7 +21,6 @@ import * as sdk from '../../../index';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
-import SettingsStore from '../../../settings/SettingsStore';
export default class KeyBackupPanel extends React.PureComponent {
constructor(props) {
@@ -316,7 +315,7 @@ export default class KeyBackupPanel extends React.PureComponent {
trustedLocally = _t("This backup is trusted because it has been restored on this session");
}
- let buttonRow = (
+ const buttonRow = (
-
- {_t("Use Legacy Verification (for older clients)")}
-
-
- );
- }
-
- _renderVerificationPhaseWaitAccept() {
- const Spinner = sdk.getComponent("views.elements.Spinner");
- const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
-
- return (
- - { _t("Verify by comparing a short text string.") } -
-- {_t("To be secure, do this in person or use a trusted way to communicate.")} -
-
-
- );
- }
-
- _renderVerificationPhasePick() {
- return {_t("Waiting for partner to accept...")}
-{_t(
- "Nothing appearing? Not all clients support interactive verification yet. " +
- ".",
- {}, {button: sub =>
-
;
- }
-
- _renderVerificationPhaseVerified() {
- const VerificationComplete = sdk.getComponent('views.verification.VerificationComplete');
- return {_t( - "Waiting for %(userId)s to confirm...", {userId: this.props.userId}, - )}
-
-
- {_t("Use two-way text verification")}
-
-
- );
-
- return (
- - { text } -
-
-
- -
-
- { this.props.device.getDisplayName() } -
-
{ this.props.device.deviceId }
- -
{ key }
-
- { _t("If it matches, press the verify button below. " + - "If it doesn't, then someone else is intercepting this session " + - "and you probably want to press the blacklist button instead.") } -
-
- {this._renderSasVerification()}
-
;
- }
- }
-}
-
-async function ensureDMExistsAndOpen(userId) {
- const roomId = await ensureDMExists(MatrixClientPeg.get(), userId);
- // don't use andView and spinner in createRoom, together, they cause this dialog to close and reopen,
- // we causes us to loose the verifier and restart, and we end up having two verification requests
- dis.dispatch({
- action: 'view_room',
- room_id: roomId,
- should_peek: false,
- });
- return roomId;
-}
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index 4274c938cc..c245ba35aa 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -33,7 +33,6 @@ import Modal from "../../../Modal";
import {humanizeTime} from "../../../utils/humanize";
import createRoom, {canEncryptToAllUsers} from "../../../createRoom";
import {inviteMultipleToRoom} from "../../../RoomInvite";
-import SettingsStore from '../../../settings/SettingsStore';
import {Key} from "../../../Keyboard";
import {Action} from "../../../dispatcher/actions";
import {RoomListStoreTempProxy} from "../../../stores/room-list/RoomListStoreTempProxy";
@@ -576,16 +575,14 @@ export default class InviteDialog extends React.PureComponent {
const createRoomOptions = {inlineErrors: true};
- if (SettingsStore.getValue("feature_cross_signing")) {
- // Check whether all users have uploaded device keys before.
- // If so, enable encryption in the new room.
- const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
- if (!has3PidMembers) {
- const client = MatrixClientPeg.get();
- const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
- if (allHaveDeviceKeys) {
- createRoomOptions.encryption = true;
- }
+ // Check whether all users have uploaded device keys before.
+ // If so, enable encryption in the new room.
+ const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
+ if (!has3PidMembers) {
+ const client = MatrixClientPeg.get();
+ const allHaveDeviceKeys = await canEncryptToAllUsers(client, targetIds);
+ if (allHaveDeviceKeys) {
+ createRoomOptions.encryption = true;
}
}
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
deleted file mode 100644
index 4cad13b047..0000000000
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
-
-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 createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import { _t } from '../../../languageHandler';
-import SettingsStore from "../../../settings/SettingsStore";
-import { markAllDevicesKnown } from '../../../cryptodevices';
-
-function UserUnknownDeviceList(props) {
- const MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
- const {userId, userDevices} = props;
-
- const deviceListEntries = Object.keys(userDevices).map((deviceId) =>
- -
- { deviceListEntries }
-
{ userId }:
-- { userListEntries }
- { _t("You are currently blacklisting unverified sessions; to send " + - "messages to these sessions you must verify them.") } -
- ); - } else { - warning = ( -
-
- );
- }
-
- let haveUnknownDevices = false;
- Object.keys(this.props.devices).forEach((userId) => {
- Object.keys(this.props.devices[userId]).map((deviceId) => {
- const device = this.props.devices[userId][deviceId];
- if (device.isUnverified() && !device.isKnown()) {
- haveUnknownDevices = true;
- }
- });
- });
- const sendButtonOnClick = haveUnknownDevices ? this._onSendAnywayClicked : this._onSendClicked;
- const sendButtonLabel = haveUnknownDevices ? this.props.sendAnywayLabel : this.props.sendAnywayLabel;
-
- const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
- const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
- return (
- - { _t("We recommend you go through the verification process " + - "for each session to confirm they belong to their legitimate owner, " + - "but you can resend the message without verifying if you prefer.") } -
-
-
- - { _t('"%(RoomName)s" contains sessions that you haven\'t seen before.', {RoomName: this.props.room.name}) } -
- { warning } - { _t("Unknown sessions") }: - -
- { verifyButton }
- { blacklistButton }
-
- );
- },
-});
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
deleted file mode 100644
index 2582cab573..0000000000
--- a/src/components/views/groups/GroupMemberInfo.js
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
-Copyright 2019 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 PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher/dispatcher';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import { GroupMemberType } from '../../../groups';
-import GroupStore from '../../../stores/GroupStore';
-import AccessibleButton from '../elements/AccessibleButton';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {Action} from "../../../dispatcher/actions";
-
-export default createReactClass({
- displayName: 'GroupMemberInfo',
-
- statics: {
- contextType: MatrixClientContext,
- },
-
- propTypes: {
- groupId: PropTypes.string,
- groupMember: GroupMemberType,
- isInvited: PropTypes.bool,
- },
-
- getInitialState: function() {
- return {
- removingUser: false,
- isUserPrivilegedInGroup: null,
- };
- },
-
- componentDidMount: function() {
- this._unmounted = false;
- this._initGroupStore(this.props.groupId);
- },
-
- // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
- UNSAFE_componentWillReceiveProps(newProps) {
- if (newProps.groupId !== this.props.groupId) {
- this._unregisterGroupStore(this.props.groupId);
- this._initGroupStore(newProps.groupId);
- }
- },
-
- componentWillUnmount() {
- this._unmounted = true;
- this._unregisterGroupStore(this.props.groupId);
- },
-
- _initGroupStore(groupId) {
- GroupStore.registerListener(groupId, this.onGroupStoreUpdated);
- },
-
- _unregisterGroupStore(groupId) {
- GroupStore.unregisterListener(this.onGroupStoreUpdated);
- },
-
- onGroupStoreUpdated: function() {
- if (this._unmounted) return;
- this.setState({
- isUserInvited: GroupStore.getGroupInvitedMembers(this.props.groupId).some(
- (m) => m.userId === this.props.groupMember.userId,
- ),
- isUserPrivilegedInGroup: GroupStore.isUserPrivileged(this.props.groupId),
- });
- },
-
- _onKick: function() {
- const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
- Modal.createDialog(ConfirmUserActionDialog, {
- matrixClient: this.context,
- groupMember: this.props.groupMember,
- action: this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community'),
- title: this.state.isUserInvited ? _t('Disinvite this user from community?')
- : _t('Remove this user from community?'),
- danger: true,
- onFinished: (proceed) => {
- if (!proceed) return;
-
- this.setState({removingUser: true});
- this.context.removeUserFromGroup(
- this.props.groupId, this.props.groupMember.userId,
- ).then(() => {
- // return to the user list
- dis.dispatch({
- action: Action.ViewUser,
- member: null,
- });
- }).catch((e) => {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
- title: _t('Error'),
- description: this.state.isUserInvited ?
- _t('Failed to withdraw invitation') :
- _t('Failed to remove user from community'),
- });
- }).finally(() => {
- this.setState({removingUser: false});
- });
- },
- });
- },
-
- _onCancel: function(e) {
- // Go back to the user list
- dis.dispatch({
- action: Action.ViewUser,
- member: null,
- });
- },
-
- onRoomTileClick(roomId) {
- dis.dispatch({
- action: 'view_room',
- room_id: roomId,
- });
- },
-
- render: function() {
- if (this.state.removingUser) {
- const Spinner = sdk.getComponent("elements.Spinner");
- return
-
;
- }
-
- let adminTools;
- if (this.state.isUserPrivilegedInGroup) {
- const kickButton = (
-
-
;
- }
- }
-
-
- const avatarUrl = this.props.groupMember.avatarUrl;
- let avatarElement;
- if (avatarUrl) {
- const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
- avatarElement = ({ _t("Admin Tools") }
-
- { kickButton }
-
-
- 
-
);
- }
-
- const groupMemberName = (
- this.props.groupMember.displayname || this.props.groupMember.userId
- );
-
- return (
-
-
-
- ![]({require("../../../../res/img/cancel.svg")})
-
- { avatarElement }
-
-
- );
- },
-});
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 0392746c94..836e35ba22 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -64,10 +64,6 @@ const _disambiguateDevices = (devices) => {
};
export const getE2EStatus = (cli, userId, devices) => {
- if (!SettingsStore.getValue("feature_cross_signing")) {
- const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
- return hasUnverifiedDevice ? "warning" : "verified";
- }
const isMe = userId === cli.getUserId();
const userTrust = cli.checkUserTrust(userId);
if (!userTrust.isCrossSigningVerified()) {
@@ -112,17 +108,15 @@ async function openDMForUser(matrixClient, userId) {
dmUserId: userId,
};
- if (SettingsStore.getValue("feature_cross_signing")) {
- // Check whether all users have uploaded device keys before.
- // If so, enable encryption in the new room.
- const usersToDevicesMap = await matrixClient.downloadKeys([userId]);
- const allHaveDeviceKeys = Object.values(usersToDevicesMap).every(devices => {
- // `devices` is an object of the form { deviceId: deviceInfo, ... }.
- return Object.keys(devices).length > 0;
- });
- if (allHaveDeviceKeys) {
- createRoomOptions.encryption = true;
- }
+ // Check whether all users have uploaded device keys before.
+ // If so, enable encryption in the new room.
+ const usersToDevicesMap = await matrixClient.downloadKeys([userId]);
+ const allHaveDeviceKeys = Object.values(usersToDevicesMap).every(devices => {
+ // `devices` is an object of the form { deviceId: deviceInfo, ... }.
+ return Object.keys(devices).length > 0;
+ });
+ if (allHaveDeviceKeys) {
+ createRoomOptions.encryption = true;
}
createRoom(createRoomOptions);
@@ -167,9 +161,7 @@ function DeviceItem({userId, device}) {
// cross-signing so that other users can then safely trust you.
// For other people's devices, the more general verified check that
// includes locally verified devices can be used.
- const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
- deviceTrust.isCrossSigningVerified() :
- deviceTrust.isVerified();
+ const isVerified = isMe ? deviceTrust.isCrossSigningVerified() : deviceTrust.isVerified();
const classes = classNames("mx_UserInfo_device", {
mx_UserInfo_device_verified: isVerified,
@@ -248,9 +240,7 @@ function DevicesSection({devices, userId, loading}) {
// cross-signing so that other users can then safely trust you.
// For other people's devices, the more general verified check that
// includes locally verified devices can be used.
- const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
- deviceTrust.isCrossSigningVerified() :
- deviceTrust.isVerified();
+ const isVerified = isMe ? deviceTrust.isCrossSigningVerified() : deviceTrust.isVerified();
if (isVerified) {
expandSectionDevices.push(device);
@@ -1309,8 +1299,7 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
const userTrust = cli.checkUserTrust(member.userId);
const userVerified = userTrust.isCrossSigningVerified();
const isMe = member.userId === cli.getUserId();
- const canVerify = SettingsStore.getValue("feature_cross_signing") &&
- homeserverSupportsCrossSigning && !userVerified && !isMe;
+ const canVerify = homeserverSupportsCrossSigning && !userVerified && !isMe;
const setUpdating = (updating) => {
setPendingUpdateCount(count => count + (updating ? 1 : -1));
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 975c8e84a5..63f31c07b9 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React from 'react';
-import ReactDOM from 'react-dom';
+import React, {createRef} from 'react';
import classNames from 'classnames';
import flatMap from 'lodash/flatMap';
import {ICompletion, ISelectionRange, IProviderCompletions} from '../../../autocomplete/Autocompleter';
@@ -54,7 +53,7 @@ export default class Autocomplete extends React.PureComponent
- { groupMemberName }
- -
-
-
- { adminTools }
-
- { this.props.groupMember.userId }
-
-
- { indicator }
-
- );
- }
-}
-
-MemberDeviceInfo.displayName = 'MemberDeviceInfo';
-MemberDeviceInfo.propTypes = {
- userId: PropTypes.string.isRequired,
- device: PropTypes.object.isRequired,
-};
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
deleted file mode 100644
index ed6c4ad748..0000000000
--- a/src/components/views/rooms/MemberInfo.js
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 Vector Creations Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-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.
-*/
-
-/*
- * State vars:
- * 'can': {
- * kick: boolean,
- * ban: boolean,
- * mute: boolean,
- * modifyLevel: boolean
- * },
- * 'muted': boolean,
- * 'isTargetMod': boolean
- */
-import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import classNames from 'classnames';
-import dis from '../../../dispatcher/dispatcher';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import createRoom from '../../../createRoom';
-import DMRoomMap from '../../../utils/DMRoomMap';
-import * as Unread from '../../../Unread';
-import { findReadReceiptFromUserId } from '../../../utils/Receipt';
-import AccessibleButton from '../elements/AccessibleButton';
-import RoomViewStore from '../../../stores/RoomViewStore';
-import SdkConfig from '../../../SdkConfig';
-import MultiInviter from "../../../utils/MultiInviter";
-import SettingsStore from "../../../settings/SettingsStore";
-import E2EIcon from "./E2EIcon";
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {Action} from "../../../dispatcher/actions";
-
-export default createReactClass({
- displayName: 'MemberInfo',
-
- propTypes: {
- member: PropTypes.object.isRequired,
- },
-
- getInitialState: function() {
- return {
- can: {
- kick: false,
- ban: false,
- mute: false,
- modifyLevel: false,
- synapseDeactivate: false,
- redactMessages: false,
- },
- muted: false,
- isTargetMod: false,
- updating: 0,
- devicesLoading: true,
- devices: null,
- isIgnoring: false,
- };
- },
-
- statics: {
- contextType: MatrixClientContext,
- },
-
- // TODO: [REACT-WARNING] Move this to constructor
- UNSAFE_componentWillMount: function() {
- this._cancelDeviceList = null;
- const cli = this.context;
-
- // only display the devices list if our client supports E2E
- this._enableDevices = cli.isCryptoEnabled();
-
- cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
- cli.on("Room", this.onRoom);
- cli.on("deleteRoom", this.onDeleteRoom);
- cli.on("Room.timeline", this.onRoomTimeline);
- cli.on("Room.name", this.onRoomName);
- cli.on("Room.receipt", this.onRoomReceipt);
- cli.on("RoomState.events", this.onRoomStateEvents);
- cli.on("RoomMember.name", this.onRoomMemberName);
- cli.on("RoomMember.membership", this.onRoomMemberMembership);
- cli.on("accountData", this.onAccountData);
-
- this._checkIgnoreState();
-
- this._updateStateForNewMember(this.props.member);
- },
-
- // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
- UNSAFE_componentWillReceiveProps: function(newProps) {
- if (this.props.member.userId !== newProps.member.userId) {
- this._updateStateForNewMember(newProps.member);
- }
- },
-
- componentWillUnmount: function() {
- const client = this.context;
- if (client) {
- client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
- client.removeListener("Room", this.onRoom);
- client.removeListener("deleteRoom", this.onDeleteRoom);
- client.removeListener("Room.timeline", this.onRoomTimeline);
- client.removeListener("Room.name", this.onRoomName);
- client.removeListener("Room.receipt", this.onRoomReceipt);
- client.removeListener("RoomState.events", this.onRoomStateEvents);
- client.removeListener("RoomMember.name", this.onRoomMemberName);
- client.removeListener("RoomMember.membership", this.onRoomMemberMembership);
- client.removeListener("accountData", this.onAccountData);
- }
- if (this._cancelDeviceList) {
- this._cancelDeviceList();
- }
- },
-
- _checkIgnoreState: function() {
- const isIgnoring = this.context.isUserIgnored(this.props.member.userId);
- this.setState({isIgnoring: isIgnoring});
- },
-
- _disambiguateDevices: function(devices) {
- const names = Object.create(null);
- for (let i = 0; i < devices.length; i++) {
- const name = devices[i].getDisplayName();
- const indexList = names[name] || [];
- indexList.push(i);
- names[name] = indexList;
- }
- for (const name in names) {
- if (names[name].length > 1) {
- names[name].forEach((j)=>{
- devices[j].ambiguous = true;
- });
- }
- }
- },
-
- onDeviceVerificationChanged: function(userId, device) {
- if (!this._enableDevices) {
- return;
- }
-
- if (userId === this.props.member.userId) {
- // no need to re-download the whole thing; just update our copy of
- // the list.
-
- const devices = this.context.getStoredDevicesForUser(userId);
- this.setState({
- devices: devices,
- e2eStatus: this._getE2EStatus(devices),
- });
- }
- },
-
- _getE2EStatus: function(devices) {
- const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
- return hasUnverifiedDevice ? "warning" : "verified";
- },
-
- onRoom: function(room) {
- this.forceUpdate();
- },
-
- onDeleteRoom: function(roomId) {
- this.forceUpdate();
- },
-
- onRoomTimeline: function(ev, room, toStartOfTimeline) {
- if (toStartOfTimeline) return;
- this.forceUpdate();
- },
-
- onRoomName: function(room) {
- this.forceUpdate();
- },
-
- onRoomReceipt: function(receiptEvent, room) {
- // because if we read a notification, it will affect notification count
- // only bother updating if there's a receipt from us
- if (findReadReceiptFromUserId(receiptEvent, this.context.credentials.userId)) {
- this.forceUpdate();
- }
- },
-
- onRoomStateEvents: function(ev, state) {
- this.forceUpdate();
- },
-
- onRoomMemberName: function(ev, member) {
- this.forceUpdate();
- },
-
- onRoomMemberMembership: function(ev, member) {
- if (this.props.member.userId === member.userId) this.forceUpdate();
- },
-
- onAccountData: function(ev) {
- if (ev.getType() === 'm.direct') {
- this.forceUpdate();
- }
- },
-
- _updateStateForNewMember: async function(member) {
- const newState = await this._calculateOpsPermissions(member);
- newState.devicesLoading = true;
- newState.devices = null;
- this.setState(newState);
-
- if (this._cancelDeviceList) {
- this._cancelDeviceList();
- this._cancelDeviceList = null;
- }
-
- this._downloadDeviceList(member);
- },
-
- _downloadDeviceList: function(member) {
- if (!this._enableDevices) {
- return;
- }
-
- let cancelled = false;
- this._cancelDeviceList = function() { cancelled = true; };
-
- const client = this.context;
- const self = this;
- client.downloadKeys([member.userId], true).then(() => {
- return client.getStoredDevicesForUser(member.userId);
- }).finally(function() {
- self._cancelDeviceList = null;
- }).then(function(devices) {
- if (cancelled) {
- // we got cancelled - presumably a different user now
- return;
- }
-
- self._disambiguateDevices(devices);
- self.setState({
- devicesLoading: false,
- devices: devices,
- e2eStatus: self._getE2EStatus(devices),
- });
- }, function(err) {
- console.log("Error downloading sessions", err);
- self.setState({devicesLoading: false});
- });
- },
-
- onIgnoreToggle: function() {
- const ignoredUsers = this.context.getIgnoredUsers();
- if (this.state.isIgnoring) {
- const index = ignoredUsers.indexOf(this.props.member.userId);
- if (index !== -1) ignoredUsers.splice(index, 1);
- } else {
- ignoredUsers.push(this.props.member.userId);
- }
-
- this.context.setIgnoredUsers(ignoredUsers).then(() => {
- return this.setState({isIgnoring: !this.state.isIgnoring});
- });
- },
-
- onKick: function() {
- const membership = this.props.member.membership;
- const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
- Modal.createTrackedDialog('Confirm User Action Dialog', 'onKick', ConfirmUserActionDialog, {
- member: this.props.member,
- action: membership === "invite" ? _t("Disinvite") : _t("Kick"),
- title: membership === "invite" ? _t("Disinvite this user?") : _t("Kick this user?"),
- askReason: membership === "join",
- danger: true,
- onFinished: (proceed, reason) => {
- if (!proceed) return;
-
- this.setState({ updating: this.state.updating + 1 });
- this.context.kick(
- this.props.member.roomId, this.props.member.userId,
- reason || undefined,
- ).then(function() {
- // NO-OP; rely on the m.room.member event coming down else we could
- // get out of sync if we force setState here!
- console.log("Kick success");
- }, function(err) {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- console.error("Kick error: " + err);
- Modal.createTrackedDialog('Failed to kick', '', ErrorDialog, {
- title: _t("Failed to kick"),
- description: ((err && err.message) ? err.message : "Operation failed"),
- });
- },
- ).finally(()=>{
- this.setState({ updating: this.state.updating - 1 });
- });
- },
- });
- },
-
- onBanOrUnban: function() {
- const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
- Modal.createTrackedDialog('Confirm User Action Dialog', 'onBanOrUnban', ConfirmUserActionDialog, {
- member: this.props.member,
- action: this.props.member.membership === 'ban' ? _t("Unban") : _t("Ban"),
- title: this.props.member.membership === 'ban' ? _t("Unban this user?") : _t("Ban this user?"),
- askReason: this.props.member.membership !== 'ban',
- danger: this.props.member.membership !== 'ban',
- onFinished: (proceed, reason) => {
- if (!proceed) return;
-
- this.setState({ updating: this.state.updating + 1 });
- let promise;
- if (this.props.member.membership === 'ban') {
- promise = this.context.unban(
- this.props.member.roomId, this.props.member.userId,
- );
- } else {
- promise = this.context.ban(
- this.props.member.roomId, this.props.member.userId,
- reason || undefined,
- );
- }
- promise.then(
- function() {
- // NO-OP; rely on the m.room.member event coming down else we could
- // get out of sync if we force setState here!
- console.log("Ban success");
- }, function(err) {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- console.error("Ban error: " + err);
- Modal.createTrackedDialog('Failed to ban user', '', ErrorDialog, {
- title: _t("Error"),
- description: _t("Failed to ban user"),
- });
- },
- ).finally(()=>{
- this.setState({ updating: this.state.updating - 1 });
- });
- },
- });
- },
-
- onRedactAllMessages: async function() {
- const {roomId, userId} = this.props.member;
- const room = this.context.getRoom(roomId);
- if (!room) {
- return;
- }
- const timelineSet = room.getUnfilteredTimelineSet();
- let eventsToRedact = [];
- for (const timeline of timelineSet.getTimelines()) {
- eventsToRedact = timeline.getEvents().reduce((events, event) => {
- if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction()) {
- return events.concat(event);
- } else {
- return events;
- }
- }, eventsToRedact);
- }
-
- const count = eventsToRedact.length;
- const user = this.props.member.name;
-
- if (count === 0) {
- const InfoDialog = sdk.getComponent("dialogs.InfoDialog");
- Modal.createTrackedDialog('No user messages found to remove', '', InfoDialog, {
- title: _t("No recent messages by %(user)s found", {user}),
- description:
-
-
-
- { deviceName }
-
-
-
,
- });
- } else {
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- const confirmed = await new Promise((resolve) => {
- Modal.createTrackedDialog('Remove recent messages by user', '', QuestionDialog, {
- title: _t("Remove recent messages by %(user)s", {user}),
- description:
- { _t("Try scrolling up in the timeline to see if there are any earlier ones.") }
-
-
,
- button: _t("Remove %(count)s messages", {count}),
- onFinished: resolve,
- });
- });
-
- if (!confirmed) {
- return;
- }
-
- // Submitting a large number of redactions freezes the UI,
- // so first yield to allow to rerender after closing the dialog.
- await Promise.resolve();
-
- console.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`);
- await Promise.all(eventsToRedact.map(async event => {
- try {
- await this.context.redactEvent(roomId, event.getId());
- } catch (err) {
- // log and swallow errors
- console.error("Could not redact", event.getId());
- console.error(err);
- }
- }));
- console.info(`Finished redacting recent ${count} messages for ${user} in ${roomId}`);
- }
- },
-
- _warnSelfDemote: function() {
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- return new Promise((resolve) => {
- Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
- title: _t("Demote yourself?"),
- description:
- { _t("You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?", {count, user}) }
-{ _t("For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.") }
-
- { _t("You will not be able to undo this change as you are demoting yourself, " +
- "if you are the last privileged user in the room it will be impossible " +
- "to regain privileges.") }
-
,
- button: _t("Demote"),
- onFinished: resolve,
- });
- });
- },
-
- onMuteToggle: async function() {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- const roomId = this.props.member.roomId;
- const target = this.props.member.userId;
- const room = this.context.getRoom(roomId);
- if (!room) return;
-
- // if muting self, warn as it may be irreversible
- if (target === this.context.getUserId()) {
- try {
- if (!(await this._warnSelfDemote())) return;
- } catch (e) {
- console.error("Failed to warn about self demotion: ", e);
- return;
- }
- }
-
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (!powerLevelEvent) return;
-
- const isMuted = this.state.muted;
- const powerLevels = powerLevelEvent.getContent();
- const levelToSend = (
- (powerLevels.events ? powerLevels.events["m.room.message"] : null) ||
- powerLevels.events_default
- );
- let level;
- if (isMuted) { // unmute
- level = levelToSend;
- } else { // mute
- level = levelToSend - 1;
- }
- level = parseInt(level);
-
- if (!isNaN(level)) {
- this.setState({ updating: this.state.updating + 1 });
- this.context.setPowerLevel(roomId, target, level, powerLevelEvent).then(
- function() {
- // NO-OP; rely on the m.room.member event coming down else we could
- // get out of sync if we force setState here!
- console.log("Mute toggle success");
- }, function(err) {
- console.error("Mute error: " + err);
- Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, {
- title: _t("Error"),
- description: _t("Failed to mute user"),
- });
- },
- ).finally(()=>{
- this.setState({ updating: this.state.updating - 1 });
- });
- }
- },
-
- onModToggle: function() {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- const roomId = this.props.member.roomId;
- const target = this.props.member.userId;
- const room = this.context.getRoom(roomId);
- if (!room) return;
-
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (!powerLevelEvent) return;
-
- const me = room.getMember(this.context.credentials.userId);
- if (!me) return;
-
- const defaultLevel = powerLevelEvent.getContent().users_default;
- let modLevel = me.powerLevel - 1;
- if (modLevel > 50 && defaultLevel < 50) modLevel = 50; // try to stick with the vector level defaults
- // toggle the level
- const newLevel = this.state.isTargetMod ? defaultLevel : modLevel;
- this.setState({ updating: this.state.updating + 1 });
- this.context.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then(
- function() {
- // NO-OP; rely on the m.room.member event coming down else we could
- // get out of sync if we force setState here!
- console.log("Mod toggle success");
- }, function(err) {
- if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
- dis.dispatch({action: 'require_registration'});
- } else {
- console.error("Toggle moderator error:" + err);
- Modal.createTrackedDialog('Failed to toggle moderator status', '', ErrorDialog, {
- title: _t("Error"),
- description: _t("Failed to toggle moderator status"),
- });
- }
- },
- ).finally(()=>{
- this.setState({ updating: this.state.updating - 1 });
- });
- },
-
- onSynapseDeactivate: function() {
- const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
- Modal.createTrackedDialog('Synapse User Deactivation', '', QuestionDialog, {
- title: _t("Deactivate user?"),
- description:
- { _t(
- "Deactivating this user will log them out and prevent them from logging back in. Additionally, " +
- "they will leave all the rooms they are in. This action cannot be reversed. Are you sure you want to " +
- "deactivate this user?"
- ) }
,
- button: _t("Deactivate user"),
- danger: true,
- onFinished: (accepted) => {
- if (!accepted) return;
- this.context.deactivateSynapseUser(this.props.member.userId).catch(e => {
- console.error("Failed to deactivate user");
- console.error(e);
-
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- Modal.createTrackedDialog('Failed to deactivate Synapse user', '', ErrorDialog, {
- title: _t('Failed to deactivate user'),
- description: ((e && e.message) ? e.message : _t("Operation failed")),
- });
- });
- },
- });
- },
-
- _applyPowerChange: function(roomId, target, powerLevel, powerLevelEvent) {
- this.setState({ updating: this.state.updating + 1 });
- this.context.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then(
- function() {
- // NO-OP; rely on the m.room.member event coming down else we could
- // get out of sync if we force setState here!
- console.log("Power change success");
- }, function(err) {
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- console.error("Failed to change power level " + err);
- Modal.createTrackedDialog('Failed to change power level', '', ErrorDialog, {
- title: _t("Error"),
- description: _t("Failed to change power level"),
- });
- },
- ).finally(()=>{
- this.setState({ updating: this.state.updating - 1 });
- });
- },
-
- onPowerChange: async function(powerLevel) {
- const roomId = this.props.member.roomId;
- const target = this.props.member.userId;
- const room = this.context.getRoom(roomId);
- if (!room) return;
-
- const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
- if (!powerLevelEvent) return;
-
- if (!powerLevelEvent.getContent().users) {
- this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
- return;
- }
-
- const myUserId = this.context.getUserId();
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-
- // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
- if (myUserId === target) {
- try {
- if (!(await this._warnSelfDemote())) return;
- this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
- } catch (e) {
- console.error("Failed to warn about self demotion: ", e);
- }
- return;
- }
-
- const myPower = powerLevelEvent.getContent().users[myUserId];
- if (parseInt(myPower) === parseInt(powerLevel)) {
- Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
- title: _t("Warning!"),
- description:
-
- { _t("You will not be able to undo this change as you are promoting the user " +
- "to have the same power level as yourself.") }
- { _t("Are you sure?") } -
,
- button: _t("Continue"),
- onFinished: (confirmed) => {
- if (confirmed) {
- this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
- }
- },
- });
- return;
- }
- this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
- },
-
- onNewDMClick: function() {
- this.setState({ updating: this.state.updating + 1 });
- createRoom({dmUserId: this.props.member.userId}).finally(() => {
- this.setState({ updating: this.state.updating - 1 });
- });
- },
-
- onLeaveClick: function() {
- dis.dispatch({
- action: 'leave_room',
- room_id: this.props.member.roomId,
- });
- },
-
- _calculateOpsPermissions: async function(member) {
- let canDeactivate = false;
- if (this.context) {
- try {
- canDeactivate = await this.context.isSynapseAdministrator();
- } catch (e) {
- console.error(e);
- }
- }
-
- const defaultPerms = {
- can: {
- // Calculate permissions for Synapse before doing the PL checks
- synapseDeactivate: canDeactivate,
- },
- muted: false,
- };
- const room = this.context.getRoom(member.roomId);
- if (!room) return defaultPerms;
-
- const powerLevels = room.currentState.getStateEvents("m.room.power_levels", "");
- if (!powerLevels) return defaultPerms;
-
- const me = room.getMember(this.context.credentials.userId);
- if (!me) return defaultPerms;
-
- const them = member;
- return {
- can: {
- ...defaultPerms.can,
- ...await this._calculateCanPermissions(me, them, powerLevels.getContent()),
- },
- muted: this._isMuted(them, powerLevels.getContent()),
- isTargetMod: them.powerLevel > powerLevels.getContent().users_default,
- };
- },
-
- _calculateCanPermissions: function(me, them, powerLevels) {
- const isMe = me.userId === them.userId;
- const can = {
- kick: false,
- ban: false,
- mute: false,
- modifyLevel: false,
- modifyLevelMax: 0,
- redactMessages: me.powerLevel >= powerLevels.redact,
- };
-
- const canAffectUser = them.powerLevel < me.powerLevel || isMe;
- if (!canAffectUser) {
- //console.info("Cannot affect user: %s >= %s", them.powerLevel, me.powerLevel);
- return can;
- }
- const editPowerLevel = (
- (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) ||
- powerLevels.state_default
- );
-
- can.kick = me.powerLevel >= powerLevels.kick;
- can.ban = me.powerLevel >= powerLevels.ban;
- can.invite = me.powerLevel >= powerLevels.invite;
- can.mute = me.powerLevel >= editPowerLevel;
- can.modifyLevel = me.powerLevel >= editPowerLevel && (isMe || me.powerLevel > them.powerLevel);
- can.modifyLevelMax = me.powerLevel;
-
- return can;
- },
-
- _isMuted: function(member, powerLevelContent) {
- if (!powerLevelContent || !member) return false;
-
- const levelToSend = (
- (powerLevelContent.events ? powerLevelContent.events["m.room.message"] : null) ||
- powerLevelContent.events_default
- );
- return member.powerLevel < levelToSend;
- },
-
- onCancel: function(e) {
- dis.dispatch({
- action: Action.ViewUser,
- member: null,
- });
- },
-
- onMemberAvatarClick: function() {
- const member = this.props.member;
- const avatarUrl = member.getMxcAvatarUrl();
- if (!avatarUrl) return;
-
- const httpUrl = this.context.mxcUrlToHttp(avatarUrl);
- const ImageView = sdk.getComponent("elements.ImageView");
- const params = {
- src: httpUrl,
- name: member.name,
- };
-
- Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
- },
-
- onRoomTileClick(roomId) {
- dis.dispatch({
- action: 'view_room',
- room_id: roomId,
- });
- },
-
- _renderDevices: function() {
- if (!this._enableDevices) return null;
-
- const devices = this.state.devices;
- const MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
- const Spinner = sdk.getComponent("elements.Spinner");
-
- let devComponents;
- if (this.state.devicesLoading) {
- // still loading
- devComponents = - { _t("Are you sure?") } -
-
- );
- },
-
- onShareUserClick: function() {
- const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
- Modal.createTrackedDialog('share room member dialog', '', ShareDialog, {
- target: this.props.member,
- });
- },
-
- _renderUserOptions: function() {
- const cli = this.context;
- const member = this.props.member;
-
- let ignoreButton = null;
- let insertPillButton = null;
- let inviteUserButton = null;
- let readReceiptButton = null;
-
- // Only allow the user to ignore the user if its not ourselves
- // same goes for jumping to read receipt
- if (member.userId !== cli.getUserId()) {
- ignoreButton = (
- { _t("Sessions") }
-
- { devComponents }
-
-
-
- );
- },
-
- render: function() {
- let startChat;
- let kickButton;
- let banButton;
- let muteButton;
- let giveModButton;
- let redactButton;
- let synapseDeactivateButton;
- let spinner;
-
- if (this.props.member.userId !== this.context.credentials.userId) {
- // TODO: Immutable DMs replaces a lot of this
- const dmRoomMap = new DMRoomMap(this.context);
- // dmRooms will not include dmRooms that we have been invited into but did not join.
- // Because DMRoomMap runs off account_data[m.direct] which is only set on join of dm room.
- // XXX: we potentially want DMs we have been invited to, to also show up here :L
- // especially as logic below concerns specially if we haven't joined but have been invited
- const dmRooms = dmRoomMap.getDMRoomsForUserId(this.props.member.userId);
-
- const RoomTile = sdk.getComponent("rooms.RoomTile");
-
- const tiles = [];
- for (const roomId of dmRooms) {
- const room = this.context.getRoom(roomId);
- if (room) {
- const myMembership = room.getMyMembership();
- // not a DM room if we have are not joined
- if (myMembership !== 'join') continue;
-
- const them = this.props.member;
- // not a DM room if they are not joined
- if (!them.membership || them.membership !== 'join') continue;
-
- const highlight = room.getUnreadNotificationCount('highlight') > 0;
-
- tiles.push(
- { _t("User Options") }
-
- { readReceiptButton }
- { shareUserButton }
- { insertPillButton }
- { ignoreButton }
- { inviteUserButton }
-
-
- ![]({require("../../../../res/img/create-big.svg")})
-
-
- { _t("Start a chat") }
-
-
;
- }
-
- if (this.state.updating) {
- const Loader = sdk.getComponent("elements.Spinner");
- spinner = { _t("Direct chats") }
- { tiles } - { startNewChat } -
-
;
- }
-
- const memberName = this.props.member.name;
-
- let presenceState;
- let presenceLastActiveAgo;
- let presenceCurrentlyActive;
- let statusMessage;
-
- if (this.props.member.user) {
- presenceState = this.props.member.user.presence;
- presenceLastActiveAgo = this.props.member.user.lastActiveAgo;
- presenceCurrentlyActive = this.props.member.user.currentlyActive;
-
- if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
- statusMessage = this.props.member.user._unstable_statusMessage;
- }
- }
-
- const room = this.context.getRoom(this.props.member.roomId);
- const powerLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null;
- const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
-
- const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
- const hsUrl = this.context.baseUrl;
- let showPresence = true;
- if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
- showPresence = enablePresenceByHsUrl[hsUrl];
- }
-
- let presenceLabel = null;
- if (showPresence) {
- const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
- presenceLabel = { _t("Admin Tools") }
- -
- { muteButton }
- { kickButton }
- { banButton }
- { redactButton }
- { giveModButton }
- { synapseDeactivateButton }
-
-
-
;
-
- const isEncrypted = this.context.isRoomEncrypted(this.props.member.roomId);
- if (this.state.e2eStatus && isEncrypted) {
- e2eIconElement = (
-
-
- {presenceLabel}
- {statusLabel}
-
-
-
-
;
- }
-
- let backButton;
- if (this.props.member.roomId) {
- backButton = (
-
-
-
- );
- },
-});
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 2d290564c3..3be378b341 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -57,21 +57,19 @@ export default createReactClass({
}
}
- if (SettingsStore.getValue("feature_cross_signing")) {
- const { roomId } = this.props.member;
- if (roomId) {
- const isRoomEncrypted = cli.isRoomEncrypted(roomId);
- this.setState({
- isRoomEncrypted,
- });
- if (isRoomEncrypted) {
- cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
- cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
- this.updateE2EStatus();
- } else {
- // Listen for room to become encrypted
- cli.on("RoomState.events", this.onRoomStateEvents);
- }
+ const { roomId } = this.props.member;
+ if (roomId) {
+ const isRoomEncrypted = cli.isRoomEncrypted(roomId);
+ this.setState({
+ isRoomEncrypted,
+ });
+ if (isRoomEncrypted) {
+ cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
+ cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
+ this.updateE2EStatus();
+ } else {
+ // Listen for room to become encrypted
+ cli.on("RoomState.events", this.onRoomStateEvents);
}
}
},
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 5cb59f7b84..84a5a3a9a0 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -308,33 +308,17 @@ export default class MessageComposer extends React.Component {
}
renderPlaceholderText() {
- if (SettingsStore.getValue("feature_cross_signing")) {
- if (this.state.isQuoting) {
- if (this.props.e2eStatus) {
- return _t('Send an encrypted reply…');
- } else {
- return _t('Send a reply…');
- }
+ if (this.state.isQuoting) {
+ if (this.props.e2eStatus) {
+ return _t('Send an encrypted reply…');
} else {
- if (this.props.e2eStatus) {
- return _t('Send an encrypted message…');
- } else {
- return _t('Send a message…');
- }
+ return _t('Send a reply…');
}
} else {
- if (this.state.isQuoting) {
- if (this.props.e2eStatus) {
- return _t('Send an encrypted reply…');
- } else {
- return _t('Send a reply (unencrypted)…');
- }
+ if (this.props.e2eStatus) {
+ return _t('Send an encrypted message…');
} else {
- if (this.props.e2eStatus) {
- return _t('Send an encrypted message…');
- } else {
- return _t('Send a message (unencrypted)…');
- }
+ return _t('Send a message…');
}
}
}
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 17495e6299..4820d0c8ff 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -168,10 +168,8 @@ export default createReactClass({
const joinRule = joinRules && joinRules.getContent().join_rule;
let privateIcon;
// Don't show an invite-only icon for DMs. Users know they're invite-only.
- if (!dmUserId && SettingsStore.getValue("feature_cross_signing")) {
- if (joinRule == "invite") {
- privateIcon =
- { backButton }
- { e2eIconElement }
-
- { avatarElement }
- { memberName }
-
-
-
-
-
-
- { this.props.member.userId }
-
- { roomMemberDetails }
-
- { this._renderUserOptions() }
-
- { adminTools }
-
- { startChat }
-
- { this._renderDevices() }
-
- { spinner }
-
- ⚠️ {_t( - "Backup key stored in secret storage, but this feature is not " + - "enabled on this session. Please enable cross-signing in Labs to " + - "modify key backup state.", - )}
; - } return{clientBackupStatus}
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index bed057f03d..b3c3f63d72 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -17,7 +17,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import {_t} from "../../../../../languageHandler";
-import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
+import {SettingLevel} from "../../../../../settings/SettingsStore";
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import * as FormattingUtils from "../../../../../utils/FormattingUtils";
import AccessibleButton from "../../../elements/AccessibleButton";
@@ -306,9 +306,7 @@ export default class SecurityUserSettingsTab extends React.Component {
// in having advanced details here once all flows are implemented, we
// can remove this.
const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
- let crossSigning;
- if (SettingsStore.getValue("feature_cross_signing")) {
- crossSigning = (
+ const crossSigning = (
{_t("Cross-signing")}
);
- }
const E2eAdvancedPanel = sdk.getComponent('views.settings.E2eAdvancedPanel');
diff --git a/src/createRoom.js b/src/createRoom.js
index 18fc787e1c..b5761e91c5 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -23,7 +23,6 @@ import dis from "./dispatcher/dispatcher";
import * as Rooms from "./Rooms";
import DMRoomMap from "./utils/DMRoomMap";
import {getAddressType} from "./UserAddress";
-import SettingsStore from "./settings/SettingsStore";
/**
* Create a new room, and switch to it.
@@ -226,10 +225,7 @@ export async function ensureDMExists(client, userId) {
if (existingDMRoom) {
roomId = existingDMRoom.roomId;
} else {
- let encryption;
- if (SettingsStore.getValue("feature_cross_signing")) {
- encryption = canEncryptToAllUsers(client, [userId]);
- }
+ const encryption = canEncryptToAllUsers(client, [userId]);
roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
await _waitForMember(client, roomId, userId);
}
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
deleted file mode 100644
index 86b97364f9..0000000000
--- a/src/cryptodevices.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-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 Resend from './Resend';
-import * as sdk from './index';
-import dis from './dispatcher/dispatcher';
-import Modal from './Modal';
-import { _t } from './languageHandler';
-
-/**
- * Mark all given devices as 'known'
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Object} devices Map from userid -> deviceid -> deviceinfo
- */
-export function markAllDevicesKnown(matrixClient, devices) {
- Object.keys(devices).forEach((userId) => {
- Object.keys(devices[userId]).map((deviceId) => {
- matrixClient.setDeviceKnown(userId, deviceId, true);
- });
- });
-}
-
-/**
- * Gets all crypto devices in a room that are marked neither known
- * nor verified.
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Room} room js-sdk room object representing the room
- * @return {Promise} A promise which resolves to a map userId->deviceId->{@link
- * module:crypto~DeviceInfo|DeviceInfo}.
- */
-export async function getUnknownDevicesForRoom(matrixClient, room) {
- const roomMembers = (await room.getEncryptionTargetMembers()).map((m) => {
- return m.userId;
- });
- const devices = await matrixClient.downloadKeys(roomMembers, false);
- const unknownDevices = {};
- // This is all devices in this room, so find the unknown ones.
- Object.keys(devices).forEach((userId) => {
- Object.keys(devices[userId]).map((deviceId) => {
- const device = devices[userId][deviceId];
-
- if (device.isUnverified() && !device.isKnown()) {
- if (unknownDevices[userId] === undefined) {
- unknownDevices[userId] = {};
- }
- unknownDevices[userId][deviceId] = device;
- }
- });
- });
- return unknownDevices;
-}
-
-function focusComposer() {
- dis.dispatch({action: 'focus_composer'});
-}
-
-/**
- * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
- * that messages they sent to this room have not been sent due to unknown devices
- * being present.
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Room} room js-sdk room object representing the room
- */
-export function showUnknownDeviceDialogForMessages(matrixClient, room) {
- getUnknownDevicesForRoom(matrixClient, room).then((unknownDevices) => {
- const onSendClicked = () => {
- Resend.resendUnsentEvents(room);
- };
-
- const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
- Modal.createTrackedDialog('Unknown Device Dialog', '', UnknownDeviceDialog, {
- room: room,
- devices: unknownDevices,
- sendAnywayLabel: _t("Send anyway"),
- sendLabel: _t("Send"),
- onSend: onSendClicked,
- onFinished: focusComposer,
- }, 'mx_Dialog_unknownDevice');
- });
-}
-
-/**
- * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
- * that a call they tried to place or answer in the room couldn't be placed or
- * answered due to unknown devices being present.
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Room} room js-sdk room object representing the room
- * @param {func} sendAnyway Function called when the 'call anyway' or 'call'
- * button is pressed. This should attempt to place or answer the call again.
- * @param {string} sendAnywayLabel Label for the button displayed to retry the call
- * when unknown devices are still present (eg. "Call Anyway")
- * @param {string} sendLabel Label for the button displayed to retry the call
- * after all devices have been verified (eg. "Call")
- */
-export function showUnknownDeviceDialogForCalls(matrixClient, room, sendAnyway, sendAnywayLabel, sendLabel) {
- getUnknownDevicesForRoom(matrixClient, room).then((unknownDevices) => {
- const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
- Modal.createTrackedDialog('Unknown Device Dialog', '', UnknownDeviceDialog, {
- room: room,
- devices: unknownDevices,
- sendAnywayLabel: sendAnywayLabel,
- sendLabel: sendLabel,
- onSend: sendAnyway,
- }, 'mx_Dialog_unknownDevice');
- });
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e925ceb588..9df98208a1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -35,12 +35,6 @@
"Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
"Dismiss": "Dismiss",
"Call Failed": "Call Failed",
- "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
- "Review Sessions": "Review Sessions",
- "Call Anyway": "Call Anyway",
- "Answer Anyway": "Answer Anyway",
- "Call": "Call",
- "Answer": "Answer",
"Call Timeout": "Call Timeout",
"The remote side failed to pick up": "The remote side failed to pick up",
"Call failed due to misconfigured server": "Call failed due to misconfigured server",
@@ -75,8 +69,6 @@
"Enter passphrase": "Enter passphrase",
"Cancel": "Cancel",
"Setting up keys": "Setting up keys",
- "Send anyway": "Send anyway",
- "Send": "Send",
"Sun": "Sun",
"Mon": "Mon",
"Tue": "Tue",
@@ -441,7 +433,6 @@
"Use the improved room list (in development - refresh to apply changes)": "Use the improved room list (in development - refresh to apply changes)",
"Support adding custom themes": "Support adding custom themes",
"Use IRC layout": "Use IRC layout",
- "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
"Show info about bridges in room settings": "Show info about bridges in room settings",
"Font size": "Font size",
"Custom font size": "Custom font size",
@@ -700,7 +691,6 @@
"Backup has an
@@ -316,7 +314,6 @@ export default class SecurityUserSettingsTab extends React.Component {