matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Fix bug that would cause failed to decrypt messages in non-encrypted rooms

Browse Source
This commit is contained in:
Will Hunt
2020-10-30 00:34:18 +00:00
parent d10234740b
commit c8485419c1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/messages/MVideoBody.tsx
View File

@@ -143,9 +143,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
} }
async _videoOnPlay() { async _videoOnPlay() {
const autoplay = SettingsStore.getValue("autoplayGifsAndVideos") as boolean; if (this._getContentUrl() || this.state.fetchingData || this.state.error) {
if (autoplay || this.state.decryptedUrl || this.state.fetchingData || this.state.error) { // We have the file, we are fetching the file, or there is an error.
// The video has or will have the data.
return; return;
} }
this.setState({ this.setState({
@@ -164,6 +163,7 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
this.setState({ this.setState({
decryptedUrl: contentUrl, decryptedUrl: contentUrl,
decryptedBlob: decryptedBlob, decryptedBlob: decryptedBlob,
fetchingData: false,
}); });
this.props.onHeightChanged(); this.props.onHeightChanged();
} }