OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Move room encryption check earlier in mount

florianduros/rip-out-legacy-crypto/migrate-filepanel-isRoomEncrypted
Florian Duros 2024-10-23 16:15:10 +02:00
parent 7507e3cb9a
commit 3ccfd9bee1
No known key found for this signature in database
GPG Key ID: A5BBB4041B493F15
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/FilePanel.tsx
View File

@ -117,15 +117,14 @@ class FilePanel extends React.Component<IProps, IState> {
public async componentDidMount(): Promise<void> { public async componentDidMount(): Promise<void> {
const client = MatrixClientPeg.safeGet(); const client = MatrixClientPeg.safeGet();
await this.updateTimelineSet(this.props.roomId);
const isRoomEncrypted = Boolean(await client.getCrypto()?.isEncryptionEnabledInRoom(this.props.roomId)); const isRoomEncrypted = Boolean(await client.getCrypto()?.isEncryptionEnabledInRoom(this.props.roomId));
this.setState({ this.setState({
isRoomEncrypted, isRoomEncrypted,
}); });
if (!isRoomEncrypted) return; await this.updateTimelineSet(this.props.roomId);
if (isRoomEncrypted) return;
// The timelineSets filter makes sure that encrypted events that contain // The timelineSets filter makes sure that encrypted events that contain
// URLs never get added to the timeline, even if they are live events. // URLs never get added to the timeline, even if they are live events.