Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 19:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when rendering shortcut avatars on buggy old versions of Android.

Browse Source
This commit is contained in:
Cody Henthorne
2025-11-21 11:57:27 -05:00
parent 180dcb3a41
commit e80aecbb4c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
View File

@@ -737,7 +737,11 @@ class ConversationRepository(
class DrawableResult(private val drawable: Drawable) : ContactPhotoResult { class DrawableResult(private val drawable: Drawable) : ContactPhotoResult {
override fun transformToFinalBitmap(): Single<Bitmap> { override fun transformToFinalBitmap(): Single<Bitmap> {
return Single.create { 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 { it.setCancellable {
bitmap.recycle() bitmap.recycle()
} }