empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix crash when unable to decode notification image preview.

Browse source
This commit is contained in:
Cody Henthorne 2022-09-23 14:21:35 -04:00
parent bdbdcccaff
commit 4f803c695b
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationThumbnails.kt
View file

@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
import org.thoughtcrime.securesms.mms.Slide import org.thoughtcrime.securesms.mms.Slide
import org.thoughtcrime.securesms.providers.BlobProvider import org.thoughtcrime.securesms.providers.BlobProvider
import org.thoughtcrime.securesms.util.BitmapDecodingException
import org.thoughtcrime.securesms.util.ImageCompressionUtil import org.thoughtcrime.securesms.util.ImageCompressionUtil
import org.thoughtcrime.securesms.util.kb import org.thoughtcrime.securesms.util.kb
import org.thoughtcrime.securesms.util.mb import org.thoughtcrime.securesms.util.mb
@ -67,7 +68,8 @@ object NotificationThumbnails {
val uri = thumbnailSlide.uri val uri = thumbnailSlide.uri
if (uri != null) { if (uri != null) {
val result = ImageCompressionUtil.compressWithinConstraints( val result: ImageCompressionUtil.Result? = try {
ImageCompressionUtil.compressWithinConstraints(
context, context,
thumbnailSlide.contentType, thumbnailSlide.contentType,
DecryptableStreamUriLoader.DecryptableUri(uri), DecryptableStreamUriLoader.DecryptableUri(uri),
@ -75,6 +77,10 @@ object NotificationThumbnails {
TARGET_SIZE, TARGET_SIZE,
60 60
) )
} catch (e: BitmapDecodingException) {
Log.i(TAG, "Unable to decode bitmap", e)
null
}
if (result != null) { if (result != null) {
val thumbnailUri = BlobProvider val thumbnailUri = BlobProvider