From c38d2ad25e4d1712d28d39f5fa97d1da53efda25 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 15 Aug 2018 11:06:54 +0200 Subject: [PATCH] small improvements for MediaUtils --- .../com/keylesspalace/tusky/util/MediaUtils.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.java index 5b16e6e73..2e93fc925 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/MediaUtils.java @@ -65,7 +65,7 @@ public class MediaUtils { * Fetches the size of the media represented by the given URI, assuming it is openable and * the ContentResolver is able to resolve it. * - * @return the size of the media or {@link MediaUtils#MEDIA_SIZE_UNKNOWN} + * @return the size of the media in bytes or {@link MediaUtils#MEDIA_SIZE_UNKNOWN} */ public static long getMediaSize(@NonNull ContentResolver contentResolver, @Nullable Uri uri) { if(uri == null) return MEDIA_SIZE_UNKNOWN; @@ -125,14 +125,12 @@ public class MediaUtils { } @Nullable - public static Bitmap getImageThumbnail(ContentResolver contentResolver, Uri uri, - @Px int thumbnailSize) { + public static Bitmap getImageThumbnail(ContentResolver contentResolver, Uri uri, @Px int thumbnailSize) { Bitmap source = getSampledBitmap(contentResolver, uri, thumbnailSize, thumbnailSize); - if(source != null) { - return ThumbnailUtils.extractThumbnail(source, thumbnailSize, thumbnailSize, ThumbnailUtils.OPTIONS_RECYCLE_INPUT); - } else { + if(source == null) { return null; } + return ThumbnailUtils.extractThumbnail(source, thumbnailSize, thumbnailSize, ThumbnailUtils.OPTIONS_RECYCLE_INPUT); } @Nullable @@ -143,9 +141,7 @@ public class MediaUtils { if (source == null) { return null; } - Bitmap bitmap = ThumbnailUtils.extractThumbnail(source, thumbnailSize, thumbnailSize); - source.recycle(); - return bitmap; + return ThumbnailUtils.extractThumbnail(source, thumbnailSize, thumbnailSize, ThumbnailUtils.OPTIONS_RECYCLE_INPUT); } public static long getImageSquarePixels(ContentResolver contentResolver, Uri uri) throws FileNotFoundException {