From f7070acf3b88f1af582a4cfbb65bc4234df2641f Mon Sep 17 00:00:00 2001
From: Talon Brown <talon.david.brown@gmail.com>
Date: Thu, 27 Feb 2025 00:42:29 -0600
Subject: [PATCH] Switched the priority of whether a file will be decrypted as
 its MIME type or its file extension.

(cherry picked from commit d48965b1d327210771873ac44999edcb6e0ef69c)
---
 .../Messages/Attachments/V2/AttachmentStream.swift          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift b/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
index 7d3809c596a..83534e1344a 100644
--- a/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
+++ b/SignalServiceKit/Messages/Attachments/V2/AttachmentStream.swift
@@ -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"
             }