From e80aecbb4cbc0d516ea44fc907614e90ec2d454d Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 21 Nov 2025 11:57:27 -0500 Subject: [PATCH] Fix crash when rendering shortcut avatars on buggy old versions of Android. --- .../securesms/conversation/v2/ConversationRepository.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt index 2380668b6b..eeefb9ff22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt @@ -737,7 +737,11 @@ class ConversationRepository( class DrawableResult(private val drawable: Drawable) : ContactPhotoResult { override fun transformToFinalBitmap(): Single { return Single.create { - val bitmap = DrawableUtil.wrapBitmapForShortcutInfo(drawable.toBitmap(SHORTCUT_ICON_SIZE, SHORTCUT_ICON_SIZE)) + val bitmap = if (Build.VERSION.SDK_INT <= 25) { + DrawableUtil.wrapBitmapForShortcutInfo(DrawableUtil.toBitmap(drawable, SHORTCUT_ICON_SIZE, SHORTCUT_ICON_SIZE)) + } else { + DrawableUtil.wrapBitmapForShortcutInfo(drawable.toBitmap(SHORTCUT_ICON_SIZE, SHORTCUT_ICON_SIZE)) + } it.setCancellable { bitmap.recycle() }