diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt index 17ef3bd7f8..ccbab486c6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -61,7 +61,12 @@ class SaveAttachmentTask @JvmOverloads constructor(context: Context, count: Int fun saveAttachment(context: Context, attachment: Attachment): String? { val contentType = checkNotNull(MediaUtil.getCorrectedMimeType(attachment.contentType)) var fileName = attachment.fileName - if (fileName == null) fileName = generateOutputFileName(contentType, attachment.date) + + // Added for SES-2624 to prevent Android API 28 devices and lower from crashing because + // for unknown reasons it provides us with an empty filename when saving files. + // TODO: Further investigation into root cause and fix! + if (fileName.isNullOrEmpty()) fileName = generateOutputFileName(contentType, attachment.date) + fileName = sanitizeOutputFileName(fileName) val outputUri: Uri = getMediaStoreContentUriForType(contentType) val mediaUri = createOutputUri(context, outputUri, contentType, fileName)