From 7a809bd26a471b46b73e48d57fe6028c40d5cd63 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 9 Mar 2022 11:19:26 -0500 Subject: [PATCH] Stop double caching the thumbnails Notification doesn't need it cached anyway, so save the space. --- .../conversations/persistance/FileBackend.java | 16 ++++------------ .../services/NotificationService.java | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 5898d7a5a..b00e27c62 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -946,18 +946,10 @@ public class FileBackend { return thumbnail; } - public Bitmap getThumbnailBitmap(Message message, Resources res, int size, boolean cacheOnly) throws IOException { - final String uuid = message.getUuid(); - final LruCache cache = mXmppConnectionService.getBitmapCache(); - Bitmap thumbnail = cache.get(uuid); - if ((thumbnail == null) && (!cacheOnly)) { - final Drawable drawable = getThumbnail(message, res, size, cacheOnly); - if (drawable != null) { - thumbnail = drawDrawable(drawable); - cache.put(uuid, thumbnail); - } - } - return thumbnail; + public Bitmap getThumbnailBitmap(Message message, Resources res, int size) throws IOException { + final Drawable drawable = getThumbnail(message, res, size, false); + if (drawable == null) return null; + return drawDrawable(drawable); } private Drawable getImagePreview(File file, Resources res, int size, final String mime) throws IOException { diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index bf90c8b56..75c9fa3cc 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -1062,7 +1062,7 @@ public class NotificationService { private void modifyForImage(final Builder builder, final Message message, final ArrayList messages) { try { - final Bitmap bitmap = mXmppConnectionService.getFileBackend().getThumbnailBitmap(message, mXmppConnectionService.getResources(), getPixel(288), false); + final Bitmap bitmap = mXmppConnectionService.getFileBackend().getThumbnailBitmap(message, mXmppConnectionService.getResources(), getPixel(288)); final ArrayList tmp = new ArrayList<>(); for (final Message msg : messages) { if (msg.getType() == Message.TYPE_TEXT