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

stop assuming that decryption happens ahead of time

Browse Source
This commit is contained in:
Germain Souquet
2021-05-18 10:02:21 +01:00
parent 4929e3f3ed
commit 871c48f69b
5 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import {RovingAccessibleTooltipButton, useRovingTabIndex} from "../../../accessi
import {replaceableComponent} from "../../../utils/replaceableComponent";
import {canCancel} from "../context_menus/MessageContextMenu";
import Resend from "../../../Resend";
import { MatrixClientPeg } from "../../../MatrixClientPeg";
const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
@@ -122,6 +123,12 @@ export default class MessageActionBar extends React.PureComponent {
if (this.props.mxEvent.status && this.props.mxEvent.status !== EventStatus.SENT) {
this.props.mxEvent.on("Event.status", this.onSent);
}
if (this.props.mxEvent.shouldAttemptDecryption()) {
const client = MatrixClientPeg.get();
this.props.mxEvent.attemptDecryption(client._crypto);
}
if (this.props.mxEvent.isBeingDecrypted()) {
this.props.mxEvent.once("Event.decrypted", this.onDecrypted);
}