From edbc624625178e2e6b1bd2219b564775cdbe2e84 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 16 Aug 2022 20:07:49 +0200
Subject: [PATCH] fix saving multiple attachments as draft (#2670)

---
 .../keylesspalace/tusky/components/drafts/DraftHelper.kt  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt b/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt
index 45da941d6..1c41132ea 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt
@@ -78,11 +78,11 @@ class DraftHelper @Inject constructor(
 
         val uris = mediaUris.map { uriString ->
             uriString.toUri()
-        }.mapNotNull { uri ->
+        }.mapIndexedNotNull { index, uri ->
             if (uri.isInFolder(draftDirectory)) {
                 uri
             } else {
-                uri.copyToFolder(draftDirectory)
+                uri.copyToFolder(draftDirectory, index)
             }
         }
 
@@ -155,7 +155,7 @@ class DraftHelper @Inject constructor(
         return File(filePath).parentFile == folder
     }
 
-    private fun Uri.copyToFolder(folder: File): Uri? {
+    private fun Uri.copyToFolder(folder: File, index: Int): Uri? {
         val contentResolver = context.contentResolver
         val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
 
@@ -167,7 +167,7 @@ class DraftHelper @Inject constructor(
             map.getExtensionFromMimeType(mimeType)
         }
 
-        val filename = String.format("Tusky_Draft_Media_%s.%s", timeStamp, fileExtension)
+        val filename = String.format("Tusky_Draft_Media_%s_%d.%s", timeStamp, index, fileExtension)
         val file = File(folder, filename)
 
         if (scheme == "https") {