Preserve file extensions for generic attachments #6232#6250
Open
RomelaGG wants to merge 1 commit intosignalapp:mainfrom
Open
Preserve file extensions for generic attachments #6232#6250RomelaGG wants to merge 1 commit intosignalapp:mainfrom
RomelaGG wants to merge 1 commit intosignalapp:mainfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
First time contributor checklist
Contributor checklist
Description
Fixes #6232
This fixes generic attachment exports losing their original filename extension when saved or shared.
Previously,
AttachmentStream.makeDecryptedCopy(filename:)preferred the MIME-derived extension before the sender-provided filename extension. For generic file attachments this can be lossy, for example:.srtattachments may havetext/plainMIME type and save as.txt.ipaattachments may haveapplication/octet-streamMIME type and save as.binFor attachments whose validated content type is
.file, this change preserves the sender's filename extension when available. Media attachments still prefer MIME-derived extensions, preserving the existing behavior for images, videos, audio, and animated images.I also replaced
URL(string:)extension extraction withNSString.pathExtension, which is safer for normal filenames that contain spaces or non-URL-safe characters.Testing:
git diff --checkpasses..srtand.ipaattachments to Files; both preserve their original file extensions.