From 78cb4d09cf06ce603dbe7f89753140b28524d669 Mon Sep 17 00:00:00 2001 From: Nite Date: Mon, 7 Jun 2021 21:38:39 +0200 Subject: [PATCH] Separated cache entries for large images --- .../src/main/java/org/moire/ultrasonic/util/FileUtil.java | 5 +++-- .../kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java index 28b80a0c..7c227bc8 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java @@ -129,9 +129,10 @@ public class FileUtil /** * Get the cache key for a given album entry * @param entry The album entry + * @param large Whether to get the key for the large or the default image * @return String The hash key */ - public static String getAlbumArtKey(MusicDirectory.Entry entry) + public static String getAlbumArtKey(MusicDirectory.Entry entry, boolean large) { File albumDir = getAlbumDirectory(entry); File albumArtDir = getAlbumArtDirectory(); @@ -140,7 +141,7 @@ public class FileUtil return null; } - return String.format(Locale.ROOT, "%s.jpeg", Util.md5Hex(albumDir.getPath())); + return String.format(Locale.ROOT, "%s%b.jpeg", Util.md5Hex(albumDir.getPath()), large); } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt index 15c7088a..f0a71f33 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt @@ -80,7 +80,7 @@ class ImageLoader( val requestedSize = resolveSize(size, large) if (id != null && id.isNotEmpty() && view is ImageView) { - val key = FileUtil.getAlbumArtKey(entry) + val key = FileUtil.getAlbumArtKey(entry, large) val request = ImageRequest.CoverArt( id, key, view, requestedSize, placeHolderDrawableRes = defaultResourceId,