Merge branch 'develop' into travis/mjolnir

src/components/views/messages/DateSeparator.js

@@ -57,7 +57,8 @@ export default class DateSeparator extends React.Component {
 
     render() {
         // ARIA treats <hr/>s as separators, here we abuse them slightly so manually treat this entire thing as one
-        return <h2 className="mx_DateSeparator" role="separator">
+        // tab-index=-1 to allow it to be focusable but do not add tab stop for it, primarily for screen readers
+        return <h2 className="mx_DateSeparator" role="separator" tabIndex={-1}>
             <hr role="none" />
             <div>{ this.getLabel() }</div>
             <hr role="none" />

src/components/views/messages/MKeyVerificationConclusion.js

@@ -0,0 +1,132 @@
+/*
+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 classNames from 'classnames';
+import PropTypes from 'prop-types';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import { _t } from '../../../languageHandler';
+import KeyVerificationStateObserver, {getNameForEventRoom, userLabelForEventRoom}
+    from '../../../utils/KeyVerificationStateObserver';
+
+export default class MKeyVerificationConclusion extends React.Component {
+    constructor(props) {
+        super(props);
+        this.keyVerificationState = null;
+        this.state = {
+            done: false,
+            cancelled: false,
+            otherPartyUserId: null,
+            cancelPartyUserId: null,
+        };
+        const rel = this.props.mxEvent.getRelation();
+        if (rel) {
+            const client = MatrixClientPeg.get();
+            const room = client.getRoom(this.props.mxEvent.getRoomId());
+            const requestEvent = room.findEventById(rel.event_id);
+            if (requestEvent) {
+                this._createStateObserver(requestEvent, client);
+                this.state = this._copyState();
+            } else {
+                const findEvent = event => {
+                    if (event.getId() === rel.event_id) {
+                        this._createStateObserver(event, client);
+                        this.setState(this._copyState());
+                        room.removeListener("Room.timeline", findEvent);
+                    }
+                };
+                room.on("Room.timeline", findEvent);
+            }
+        }
+    }
+
+    _createStateObserver(requestEvent, client) {
+        this.keyVerificationState = new KeyVerificationStateObserver(requestEvent, client, () => {
+            this.setState(this._copyState());
+        });
+    }
+
+    _copyState() {
+        const {done, cancelled, otherPartyUserId, cancelPartyUserId} = this.keyVerificationState;
+        return {done, cancelled, otherPartyUserId, cancelPartyUserId};
+    }
+
+    componentDidMount() {
+        if (this.keyVerificationState) {
+            this.keyVerificationState.attach();
+        }
+    }
+
+    componentWillUnmount() {
+        if (this.keyVerificationState) {
+            this.keyVerificationState.detach();
+        }
+    }
+
+    _getName(userId) {
+        const roomId = this.props.mxEvent.getRoomId();
+        const client = MatrixClientPeg.get();
+        const room = client.getRoom(roomId);
+        const member = room.getMember(userId);
+        return member ? member.name : userId;
+    }
+
+    _userLabel(userId) {
+        const name = this._getName(userId);
+        if (name !== userId) {
+            return _t("%(name)s (%(userId)s)", {name, userId});
+        } else {
+            return userId;
+        }
+    }
+
+    render() {
+        const {mxEvent} = this.props;
+        const client = MatrixClientPeg.get();
+        const myUserId = client.getUserId();
+        let title;
+
+        if (this.state.done) {
+            title = _t("You verified %(name)s", {name: getNameForEventRoom(this.state.otherPartyUserId, mxEvent)});
+        } else if (this.state.cancelled) {
+            if (mxEvent.getSender() === myUserId) {
+                title = _t("You cancelled verifying %(name)s",
+                    {name: getNameForEventRoom(this.state.otherPartyUserId, mxEvent)});
+            } else if (mxEvent.getSender() === this.state.otherPartyUserId) {
+                title = _t("%(name)s cancelled verifying",
+                    {name: getNameForEventRoom(this.state.otherPartyUserId, mxEvent)});
+            }
+        }
+
+        if (title) {
+            const subtitle = userLabelForEventRoom(this.state.otherPartyUserId, mxEvent);
+            const classes = classNames("mx_EventTile_bubble", "mx_KeyVerification", "mx_KeyVerification_icon", {
+                mx_KeyVerification_icon_verified: this.state.done,
+            });
+            return (<div className={classes}>
+                <div className="mx_KeyVerification_title">{title}</div>
+                <div className="mx_KeyVerification_subtitle">{subtitle}</div>
+            </div>);
+        }
+
+        return null;
+    }
+}
+
+MKeyVerificationConclusion.propTypes = {
+    /* the MatrixEvent to show */
+    mxEvent: PropTypes.object.isRequired,
+};

src/components/views/messages/MKeyVerificationRequest.js

@@ -0,0 +1,141 @@
+/*
+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 MatrixClientPeg from '../../../MatrixClientPeg';
+import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
+import sdk from '../../../index';
+import Modal from "../../../Modal";
+import { _t } from '../../../languageHandler';
+import KeyVerificationStateObserver, {getNameForEventRoom, userLabelForEventRoom}
+    from '../../../utils/KeyVerificationStateObserver';
+
+export default class MKeyVerificationRequest extends React.Component {
+    constructor(props) {
+        super(props);
+        this.keyVerificationState = new KeyVerificationStateObserver(this.props.mxEvent, MatrixClientPeg.get(), () => {
+            this.setState(this._copyState());
+        });
+        this.state = this._copyState();
+    }
+
+    _copyState() {
+        const {accepted, done, cancelled, cancelPartyUserId, otherPartyUserId} = this.keyVerificationState;
+        return {accepted, done, cancelled, cancelPartyUserId, otherPartyUserId};
+    }
+
+    componentDidMount() {
+        this.keyVerificationState.attach();
+    }
+
+    componentWillUnmount() {
+        this.keyVerificationState.detach();
+    }
+
+    _onAcceptClicked = () => {
+        const IncomingSasDialog = sdk.getComponent('views.dialogs.IncomingSasDialog');
+        // todo: validate event, for example if it has sas in the methods.
+        const verifier = MatrixClientPeg.get().acceptVerificationDM(this.props.mxEvent, verificationMethods.SAS);
+        Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
+            verifier,
+        });
+    };
+
+    _onRejectClicked = () => {
+        // todo: validate event, for example if it has sas in the methods.
+        const verifier = MatrixClientPeg.get().acceptVerificationDM(this.props.mxEvent, verificationMethods.SAS);
+        verifier.cancel("User declined");
+    };
+
+    _acceptedLabel(userId) {
+        const client = MatrixClientPeg.get();
+        const myUserId = client.getUserId();
+        if (userId === myUserId) {
+            return _t("You accepted");
+        } else {
+            return _t("%(name)s accepted", {name: getNameForEventRoom(userId, this.props.mxEvent)});
+        }
+    }
+
+    _cancelledLabel(userId) {
+        const client = MatrixClientPeg.get();
+        const myUserId = client.getUserId();
+        if (userId === myUserId) {
+            return _t("You cancelled");
+        } else {
+            return _t("%(name)s cancelled", {name: getNameForEventRoom(userId, this.props.mxEvent)});
+        }
+    }
+
+    render() {
+        const {mxEvent} = this.props;
+        const fromUserId = mxEvent.getSender();
+        const content = mxEvent.getContent();
+        const toUserId = content.to;
+        const client = MatrixClientPeg.get();
+        const myUserId = client.getUserId();
+        const isOwn = fromUserId === myUserId;
+
+        let title;
+        let subtitle;
+        let stateNode;
+
+        if (this.state.accepted || this.state.cancelled) {
+            let stateLabel;
+            if (this.state.accepted) {
+                stateLabel = this._acceptedLabel(toUserId);
+            } else if (this.state.cancelled) {
+                stateLabel = this._cancelledLabel(this.state.cancelPartyUserId);
+            }
+            stateNode = (<div className="mx_KeyVerification_state">{stateLabel}</div>);
+        }
+
+        if (toUserId === myUserId) { // request sent to us
+            title = (<div className="mx_KeyVerification_title">{
+                _t("%(name)s wants to verify", {name: getNameForEventRoom(fromUserId, mxEvent)})}</div>);
+            subtitle = (<div className="mx_KeyVerification_subtitle">{
+                userLabelForEventRoom(fromUserId, mxEvent)}</div>);
+            const isResolved = !(this.state.accepted || this.state.cancelled || this.state.done);
+            if (isResolved) {
+                const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+                stateNode = (<div className="mx_KeyVerification_buttons">
+                    <AccessibleButton kind="decline" onClick={this._onRejectClicked}>{_t("Decline")}</AccessibleButton>
+                    <AccessibleButton kind="accept" onClick={this._onAcceptClicked}>{_t("Accept")}</AccessibleButton>
+                </div>);
+            }
+        } else if (isOwn) { // request sent by us
+            title = (<div className="mx_KeyVerification_title">{
+                _t("You sent a verification request")}</div>);
+            subtitle = (<div className="mx_KeyVerification_subtitle">{
+                userLabelForEventRoom(this.state.otherPartyUserId, mxEvent)}</div>);
+        }
+
+        if (title) {
+            return (<div className="mx_EventTile_bubble mx_KeyVerification mx_KeyVerification_icon">
+                {title}
+                {subtitle}
+                {stateNode}
+            </div>);
+        }
+        return null;
+    }
+}
+
+MKeyVerificationRequest.propTypes = {
+    /* the MatrixEvent to show */
+    mxEvent: PropTypes.object.isRequired,
+};

src/components/views/messages/MessageActionBar.js

@@ -180,7 +180,8 @@ export default class MessageActionBar extends React.PureComponent {
             />;
         }
 
-        return <div className="mx_MessageActionBar">
+        // aria-live=off to not have this read out automatically as navigating around timeline, gets repetitive.
+        return <div className="mx_MessageActionBar" role="toolbar" aria-label={_t("Message Actions")} aria-live="off">
             {reactButton}
             {replyButton}
             {editButton}

src/components/views/messages/MessageTimestamp.js

@@ -28,7 +28,7 @@ export default class MessageTimestamp extends React.Component {
     render() {
         const date = new Date(this.props.ts);
         return (
-            <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)}>
+            <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)} aria-hidden={true}>
                 { formatTime(date, this.props.showTwelveHour) }
             </span>
         );