Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix saving multiple attachments as draft (#2670)

This commit is contained in:
Konrad Pozniak 2022-08-16 20:07:49 +02:00 committed by GitHub
parent 94ae64b52d
commit edbc624625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt
View File

@ -78,11 +78,11 @@ class DraftHelper @Inject constructor(
val uris = mediaUris.map { uriString -> val uris = mediaUris.map { uriString ->
uriString.toUri() uriString.toUri()
}.mapNotNull { uri -> }.mapIndexedNotNull { index, uri ->
if (uri.isInFolder(draftDirectory)) { if (uri.isInFolder(draftDirectory)) {
uri uri
} else { } else {
uri.copyToFolder(draftDirectory) uri.copyToFolder(draftDirectory, index)
} }
} }
@ -155,7 +155,7 @@ class DraftHelper @Inject constructor(
return File(filePath).parentFile == folder 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 contentResolver = context.contentResolver
val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date()) val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
@ -167,7 +167,7 @@ class DraftHelper @Inject constructor(
map.getExtensionFromMimeType(mimeType) 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) val file = File(folder, filename)
if (scheme == "https") { if (scheme == "https") {