From eded335766449173e53cc3d8dd2fdb426a0a9584 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 13 Apr 2026 16:52:35 -0400
Subject: [PATCH] Fix potential crash when saving to fallback attachment
 folder.

Fixes #14720
---
 .../java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
index 8fca7e958c..92684951b3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
@@ -216,6 +216,9 @@ object SaveAttachmentUtil {
     } catch (e: RuntimeException) {
       if (e is IllegalArgumentException || e.cause is IllegalArgumentException) {
         Log.w(TAG, "Unable to create uri in $outputUri with mimeType [$mimeType]")
+        if (Build.VERSION.SDK_INT > 28) {
+          contentValues.put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + "/Signal")
+        }
         CreateMediaUriResult(StorageUtil.getDownloadUri(), AppDependencies.application.contentResolver.insert(StorageUtil.getDownloadUri(), contentValues))
       } else {
         throw e