OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Watch for Event.status instead as we can do some things in SENT

pull/21833/head
Michael Telatynski 2020-08-14 13:37:11 +01:00
parent de9816574f
commit 591847b274
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/views/messages/MessageActionBar.js
View File

@ -18,6 +18,7 @@ limitations under the License.
import React, {useEffect} from 'react'; import React, {useEffect} from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { EventStatus } from 'matrix-js-sdk';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import * as sdk from '../../../index'; import * as sdk from '../../../index';
@ -114,19 +115,19 @@ export default class MessageActionBar extends React.PureComponent {
static contextType = RoomContext; static contextType = RoomContext;
componentDidMount() { componentDidMount() {
if (this.props.mxEvent.status && this.props.mxEvent !== EventStatus.SENT) {
this.props.mxEvent.on("Event.status", this.onSent);
}
if (this.props.mxEvent.isBeingDecrypted()) { if (this.props.mxEvent.isBeingDecrypted()) {
this.props.mxEvent.once("Event.decrypted", this.onDecrypted); this.props.mxEvent.once("Event.decrypted", this.onDecrypted);
} }
this.props.mxEvent.on("Event.beforeRedaction", this.onBeforeRedaction); this.props.mxEvent.on("Event.beforeRedaction", this.onBeforeRedaction);
if (this.props.mxEvent.getId()[0] !== "!") {
this.props.mxEvent.once("Event.localEventIdReplaced", this.onEcho);
}
} }
componentWillUnmount() { componentWillUnmount() {
this.props.mxEvent.off("Event.status", this.onSent);
this.props.mxEvent.off("Event.decrypted", this.onDecrypted); this.props.mxEvent.off("Event.decrypted", this.onDecrypted);
this.props.mxEvent.off("Event.beforeRedaction", this.onBeforeRedaction); this.props.mxEvent.off("Event.beforeRedaction", this.onBeforeRedaction);
this.props.mxEvent.off("Event.localEventIdReplaced", this.onEcho);
} }
onDecrypted = () => { onDecrypted = () => {
@ -140,7 +141,7 @@ export default class MessageActionBar extends React.PureComponent {
this.forceUpdate(); this.forceUpdate();
}; };
onEcho = () => { onSent = () => {
// When an event is sent and echoed the possible actions change. // When an event is sent and echoed the possible actions change.
this.forceUpdate(); this.forceUpdate();
}; };