Skip to content

#5876 Switched file decryption priority to be original file extension #5988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#5876 Switched file decryption priority to be original file extension #5988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ public class AttachmentStream {
/// will instead be inferred from the file contents) and made url-safe AND user-friendly. If nil, a random file name is used.
public func makeDecryptedCopy(filename: String?) throws -> URL {
var pathExtension: String = {
if let pathExtension = MimeTypeUtil.fileExtensionForMimeType(mimeType) {
return pathExtension
} else if
if
let filename,
let filenameUrl = URL(string: filename),
let pathExtension = filenameUrl.pathExtension.nilIfEmpty
{
return pathExtension
} else if let pathExtension = MimeTypeUtil.fileExtensionForMimeType(mimeType) {
return pathExtension
} else {
return "bin"
}
Expand Down