Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix download button not working on events that were decrypted too late #8556

Merged
merged 1 commit into from
May 10, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/components/views/messages/MessageEvent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { Relations } from 'matrix-js-sdk/src/models/relations';
import { M_BEACON_INFO } from 'matrix-js-sdk/src/@types/beacon';
import { M_LOCATION } from 'matrix-js-sdk/src/@types/location';
import { M_POLL_START } from "matrix-events-sdk";
import { MatrixEventEvent } from "matrix-js-sdk/src/models/event";

import SettingsStore from "../../../settings/SettingsStore";
import { Mjolnir } from "../../../mjolnir/Mjolnir";
Expand Down Expand Up @@ -73,7 +74,12 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
}
}

public componentDidMount(): void {
this.props.mxEvent.addListener(MatrixEventEvent.Decrypted, this.onDecrypted);
}

public componentWillUnmount() {
this.props.mxEvent.removeListener(MatrixEventEvent.Decrypted, this.onDecrypted);
this.mediaHelper?.destroy();
}

Expand Down Expand Up @@ -118,6 +124,14 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
return this.mediaHelper;
}

private onDecrypted = (): void => {
// Recheck MediaEventHelper eligibility as it can change when the event gets decrypted
if (MediaEventHelper.isEligible(this.props.mxEvent)) {
this.mediaHelper?.destroy();
this.mediaHelper = new MediaEventHelper(this.props.mxEvent);
}
};

private onTileUpdate = () => {
this.forceUpdate();
};
Expand Down