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

Use client.decryptEvent to avoid accessing js-sdk private members

Browse Source
This commit is contained in:
Germain Souquet
2021-05-18 11:41:20 +01:00
parent 871c48f69b
commit 1cfd4b6e1a
5 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,9 +50,8 @@ 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);
}
const client = MatrixClientPeg.get();
client.decryptEvent(ev);
if (ev.isBeingDecrypted()) {
this.decryptingEvents.add(ev.getId());

3
src/components/structures/TimelinePanel.js
View File

@@ -1150,7 +1150,8 @@ class TimelinePanel extends React.Component {
.reverse()
.forEach(event => {
if (event.shouldAttemptDecryption()) {
event.attemptDecryption(MatrixClientPeg.get()._crypto);
const client = MatrixClientPeg.get();
client.decryptEvent(event);
}
});

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

@@ -126,7 +126,7 @@ export default class MessageActionBar extends React.PureComponent {
if (this.props.mxEvent.shouldAttemptDecryption()) {
const client = MatrixClientPeg.get();
this.props.mxEvent.attemptDecryption(client._crypto);
client.decryptEvent(this.props.mxEvent);
}
if (this.props.mxEvent.isBeingDecrypted()) {

2
src/components/views/messages/ViewSourceEvent.js
View File

@@ -40,7 +40,7 @@ export default class ViewSourceEvent extends React.PureComponent {
const client = MatrixClientPeg.get();
if (mxEvent.shouldAttemptDecryption()) {
mxEvent.attemptDecryption(client._client._crypto);
client.decryptEvent(mxEvent);
}
if (mxEvent.isBeingDecrypted()) {