From c48b8bf54566f8895288476eb3266ecfd15e318a Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Thu, 25 Jan 2024 17:45:20 +0100
Subject: [PATCH] fix: Don't leak MainActivity in DrawerImageLoader (#382)

Previous code created the drawer image loader as an anonymous inner
class that kept a reference to `glide`, which had a reference to `this`
and could leak.

Fix that by create a separate class that takes these as constructor
parameters.
---
 app/src/main/java/app/pachli/MainActivity.kt | 54 ++++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/app/pachli/MainActivity.kt b/app/src/main/java/app/pachli/MainActivity.kt
index e258b43c0..916d36fef 100644
--- a/app/src/main/java/app/pachli/MainActivity.kt
+++ b/app/src/main/java/app/pachli/MainActivity.kt
@@ -603,34 +603,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
 
         val animateAvatars = sharedPreferencesRepository.getBoolean(PrefKeys.ANIMATE_GIF_AVATARS, false)
 
-        DrawerImageLoader.init(
-            object : AbstractDrawerImageLoader() {
-                override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                    if (animateAvatars) {
-                        glide.load(uri)
-                            .placeholder(placeholder)
-                            .into(imageView)
-                    } else {
-                        glide.asBitmap()
-                            .load(uri)
-                            .placeholder(placeholder)
-                            .into(imageView)
-                    }
-                }
-
-                override fun cancel(imageView: ImageView) {
-                    glide.clear(imageView)
-                }
-
-                override fun placeholder(ctx: Context, tag: String?): Drawable {
-                    if (tag == DrawerImageLoader.Tags.PROFILE.name || tag == DrawerImageLoader.Tags.PROFILE_DRAWER_ITEM.name) {
-                        return AppCompatResources.getDrawable(ctx, R.drawable.avatar_default)!!
-                    }
-
-                    return super.placeholder(ctx, tag)
-                }
-            },
-        )
+        DrawerImageLoader.init(MainDrawerImageLoader(glide, animateAvatars))
 
         binding.mainDrawer.apply {
             refreshMainDrawerItems(addSearchButton)
@@ -1291,3 +1264,28 @@ private var AbstractDrawerItem<*, *>.onClick: () -> Unit
             false
         }
     }
+
+/**
+ * Load images in to the drawer using the [RequestManager] in [glide].
+ */
+class MainDrawerImageLoader(val glide: RequestManager, val animateAvatars: Boolean) : AbstractDrawerImageLoader() {
+    override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
+        if (animateAvatars) {
+            glide.load(uri).placeholder(placeholder).into(imageView)
+        } else {
+            glide.asBitmap().load(uri).placeholder(placeholder).into(imageView)
+        }
+    }
+
+    override fun cancel(imageView: ImageView) {
+        glide.clear(imageView)
+    }
+
+    override fun placeholder(ctx: Context, tag: String?): Drawable {
+        if (tag == DrawerImageLoader.Tags.PROFILE.name || tag == DrawerImageLoader.Tags.PROFILE_DRAWER_ITEM.name) {
+            return AppCompatResources.getDrawable(ctx, R.drawable.avatar_default)!!
+        }
+
+        return super.placeholder(ctx, tag)
+    }
+}