From 1c48352432db644261abcfbbc7a86ae5dcadfb89 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 5 Nov 2022 00:54:17 +0530 Subject: [PATCH] Fix issue previewing GIF files --- .../smsmessenger/activities/ThreadActivity.kt | 2 +- .../smsmessenger/adapters/AttachmentsAdapter.kt | 8 +++----- .../simplemobiletools/smsmessenger/extensions/String.kt | 4 ++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 62a2306c..67d05da0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -933,7 +933,7 @@ class ThreadActivity : SimpleActivity() { uri = uri, mimetype = mimeType, filename = getFilenameFromUri(uri), - isPending = mimeType.isImageMimeType() + isPending = mimeType.isImageMimeType() && !mimeType.isGifMimeType() ) adapter.addAttachment(attachment) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt index c96fccdd..a0075441 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt @@ -20,10 +20,7 @@ import com.bumptech.glide.request.target.Target import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.smsmessenger.activities.VCardViewerActivity -import com.simplemobiletools.smsmessenger.extensions.config -import com.simplemobiletools.smsmessenger.extensions.isImageMimeType -import com.simplemobiletools.smsmessenger.extensions.isVideoMimeType -import com.simplemobiletools.smsmessenger.extensions.launchViewIntent +import com.simplemobiletools.smsmessenger.extensions.* import com.simplemobiletools.smsmessenger.helpers.* import com.simplemobiletools.smsmessenger.models.AttachmentSelection import kotlinx.android.synthetic.main.item_attachment_media_preview.view.* @@ -129,7 +126,8 @@ class AttachmentsAdapter( } } - if (attachment.mimetype.isImageMimeType() && attachment.isPending && config.mmsFileSizeLimit != FILE_SIZE_NONE) { + val compressImage = attachment.mimetype.isImageMimeType() && !attachment.mimetype.isGifMimeType() + if (compressImage && attachment.isPending && config.mmsFileSizeLimit != FILE_SIZE_NONE) { thumbnail.beGone() compression_progress.beVisible() diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt index 8ba65db8..953564ba 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt @@ -15,6 +15,10 @@ fun String.isImageMimeType(): Boolean { return lowercase().startsWith("image") } +fun String.isGifMimeType(): Boolean { + return lowercase().endsWith("gif") +} + fun String.isVideoMimeType(): Boolean { return lowercase().startsWith("video") }