From 8c1ddcf1c05fdc50693e5984c9397e4368956b5b Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 25 Mar 2022 09:20:25 -0300
Subject: [PATCH] Fix issue where thumb resource wasn't set to null after
 clear.

---
 .../org/thoughtcrime/securesms/components/ThumbnailView.java  | 4 ++++
 .../securesms/stories/landing/StoriesLandingItem.kt           | 1 +
 .../org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt    | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
index d1bb3580bd..62fdf5a25c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -428,11 +428,15 @@ public class ThumbnailView extends FrameLayout {
 
   public void clear(GlideRequests glideRequests) {
     glideRequests.clear(image);
+    image.setImageDrawable(null);
 
     if (transferControls.isPresent()) {
       getTransferControls().clear();
     }
 
+    glideRequests.clear(blurhash);
+    blurhash.setImageDrawable(null);
+
     slide = null;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
index aad593329d..bd1cfe98d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
@@ -136,6 +136,7 @@ object StoriesLandingItem {
           storyMulti.visible = false
         }
       } else {
+        storyMulti.clear(GlideApp.with(storyPreview))
         storyMulti.visible = false
       }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
index a778c186cd..0b276e190f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
@@ -103,9 +103,9 @@ object MyStoriesItem {
       if (record.storyType.isTextStory) {
         storyPreview.setImageResource(GlideApp.with(storyPreview), StoryTextPostModel.parseFrom(record), 0, 0)
       } else if (thumbnail != null) {
-        storyPreview.setImageResource(GlideApp.with(itemView), thumbnail, false, true)
+        storyPreview.setImageResource(GlideApp.with(storyPreview), thumbnail, false, true)
       } else {
-        storyPreview.clear(GlideApp.with(itemView))
+        storyPreview.clear(GlideApp.with(storyPreview))
       }
     }