matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

fixes!

Browse Source
This commit is contained in:
Bruno Windels
2020-01-03 13:40:20 +01:00
parent 3b9c5c0a27
commit 7a88a94936
5 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/views/messages/MKeyVerificationConclusion.js
View File

@@ -45,32 +45,51 @@ export default class MKeyVerificationConclusion extends React.Component {
this.forceUpdate();
};
_shouldRender(mxEvent, request) {
// normally should not happen
if (!request) {
return false;
}
// .cancel event that was sent after the verification finished, ignore
if (mxEvent.getType() === "m.key.verification.cancel" && !request.cancelled) {
return false;
}
// .done event that was sent after the verification cancelled, ignore
if (mxEvent.getType() === "m.key.verification.done" && !request.done) {
return false;
}
// request hasn't concluded yet
if (request.pending) {
return false;
}
return true;
}
render() {
const {mxEvent} = this.props;
const request = mxEvent.verificationRequest;
if (!request) {
if (!this._shouldRender(mxEvent, request)) {
return null;
}
const client = MatrixClientPeg.get();
const myUserId = client.getUserId();
let title;
if (request.done) {
title = _t("You verified %(name)s", {name: getNameForEventRoom(request.otherUserId, mxEvent)});
} else if (request.cancelled) {
if (mxEvent.getSender() === myUserId) {
const userId = request.cancellingUserId;
if (userId === myUserId) {
title = _t("You cancelled verifying %(name)s",
{name: getNameForEventRoom(request.otherUserId, mxEvent)});
} else if (mxEvent.getSender() === request.otherUserId) {
} else {
title = _t("%(name)s cancelled verifying",
{name: getNameForEventRoom(request.otherUserId, mxEvent)});
{name: getNameForEventRoom(userId, mxEvent)});
}
} else {
title = `request conclusion tile with phase ${request.phase}`;
}
if (title) {