From fd16512869c2562a86e5249fc9d2905578d15eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Fri, 16 Mar 2018 15:37:47 +0100 Subject: [PATCH] BitmapUtil: Prevent NPE on app startup --- .../org/videolan/vlc/gui/helpers/BitmapUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapUtil.java b/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapUtil.java index e78194a5b..ba308ee2e 100644 --- a/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapUtil.java +++ b/vlc-android/src/org/videolan/vlc/gui/helpers/BitmapUtil.java @@ -100,8 +100,8 @@ public class BitmapUtil { private static Bitmap fetchPicture(MediaWrapper media) { final BitmapCache cache = BitmapCache.getInstance(); - Bitmap picture = readCoverBitmap(media.getArtworkURL()); - cache.addBitmapToMemCache(media.getLocation(), picture); + final Bitmap picture = readCoverBitmap(media.getArtworkURL()); + if (picture != null) cache.addBitmapToMemCache(media.getLocation(), picture); return picture; } @@ -114,12 +114,12 @@ public class BitmapUtil { } private static Bitmap readCoverBitmap(String path) { - if (path == null) - return null; - Resources res = VLCApplication.getAppResources(); + if (path == null) return null; + final Context ctx = VLCApplication.getAppContext(); + if (ctx == null) return null; + final Resources res = ctx.getResources(); String uri = Uri.decode(path); - if (uri.startsWith("file://")) - uri = uri.substring(7); + if (uri.startsWith("file://")) uri = uri.substring(7); Bitmap cover = null; BitmapFactory.Options options = new BitmapFactory.Options(); int height = res.getDimensionPixelSize(R.dimen.grid_card_thumb_height); -- 2.22.0