matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +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

4
src/components/structures/FilePanel.js
View File

@@ -50,6 +50,10 @@ class FilePanel extends React.Component {
if (room?.roomId !== this.props?.roomId) return;
if (toStartOfTimeline || !data || !data.liveEvent || ev.isRedacted()) return;
if (ev.shouldAttemptDecryption()) {
ev.attemptDecryption(room._client._crypto);
}
if (ev.isBeingDecrypted()) {
this.decryptingEvents.add(ev.getId());
} else {

2
src/components/structures/RoomView.tsx
View File

@@ -811,7 +811,7 @@ export default class RoomView extends React.Component<IProps, IState> {
};
private onEvent = (ev) => {
if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
if (ev.isBeingDecrypted() || ev.isDecryptionFailure() || ev.shouldAttemptDecryption()) return;
this.handleEffects(ev);
};