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

Use the mimetype from the info property rather than the EncryptedFile #6591

Merged
merged 2 commits into from
Aug 10, 2021
Merged

Use the mimetype from the info property rather than the EncryptedFile #6591

merged 2 commits into from
Aug 10, 2021

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Aug 10, 2021

The mimetype in EncryptedFile is undocumented and redundant.
See matrix-org/matrix-spec-proposals#2582

Note: this only affects receiving events, and does not change sending the event, so it does not fix issue element-hq/element-web#17145

@uhoreg uhoreg requested a review from a team as a code owner August 10, 2021 23:31
@github-actions
Copy link

This PR currently has no changelog labels, so will not be included in changelogs.

Add one of: T-Enhancement, T-Defect, T-Task to indicate what type of change this is plus X-Breaking-Change if it's a breaking change.

src/utils/DecryptFile.ts Outdated Show resolved Hide resolved
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sane to me :shipit:

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants