From f76b707f09d1c6697b285c29b58e5d993c381b75 Mon Sep 17 00:00:00 2001 From: Chris Narkiewicz Date: Sun, 16 Jun 2019 14:58:00 +0100 Subject: [PATCH] Fix crash when drawing play icon on video thumbnail Bitmap decoder does not work with vector drawables. Fixes #4129 Fixes #4150 Signed-off-by: Chris Narkiewicz --- .../owncloud/android/datamodel/ThumbnailsCacheManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index 79c419469652..09d2b1617eda 100644 --- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -1047,8 +1047,8 @@ private static ResizedImageGenerationTask getResizedImageGenerationWorkerTask(Im } public static Bitmap addVideoOverlay(Bitmap thumbnail){ - Bitmap playButton = BitmapFactory.decodeResource(MainApp.getAppContext().getResources(), - R.drawable.view_play); + Drawable playButtonDrawable = MainApp.getAppContext().getResources().getDrawable(R.drawable.view_play); + Bitmap playButton = BitmapUtils.drawableToBitmap(playButtonDrawable); Bitmap resizedPlayButton = Bitmap.createScaledBitmap(playButton, (int) (thumbnail.getWidth() * 0.3),