Added avatar cache cleaner

Author: JBsesh

app/src/main/java/org/session/libsession/avatars/AvatarCacheCleaner.kt

@@ -0,0 +1,66 @@
+package org.session.libsession.avatars
+
+import android.app.Application
+import com.bumptech.glide.Glide
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.session.libsession.utilities.recipients.RemoteFile
+import org.session.libsignal.utilities.Log
+import org.thoughtcrime.securesms.attachments.RemoteFileDownloadWorker
+import org.thoughtcrime.securesms.dependencies.ManagerScope
+import org.thoughtcrime.securesms.glide.RecipientAvatarDownloadManager
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AvatarCacheCleaner @Inject constructor(
+    private val application: Application,
+    private val avatarDownloadManager: RecipientAvatarDownloadManager, // we can reuse some logic here
+    @param:ManagerScope private val coroutineScope: CoroutineScope
+) {
+
+    companion object {
+        const val TAG = "AvatarCacheCleaner"
+    }
+
+    /**
+     * Deletes avatar files under cache/remote_files that are no longer referenced
+     * in the current config. Returns number of files deleted.
+     */
+    suspend fun cleanUpAvatars(): Int = withContext(Dispatchers.IO) {
+        // 1) Build the set of still-wanted RemoteFiles (contacts + groups)
+        val wantedRemotes: Set<RemoteFile> = avatarDownloadManager.getAllAvatars()
+
+        // 2) Map to actual files (same hashing/location as downloader)
+        val wantedFiles: Set<File> = wantedRemotes
+            .map { RemoteFileDownloadWorker.computeFileName(application, it) }
+            .toSet()
+
+        // 3) Delete everything not wanted in cache/remote_files
+        val dir = File(application.cacheDir, "remote_files")
+        val files = dir.listFiles().orEmpty()
+        var deleted = 0
+        for (f in files) {
+            if (f !in wantedFiles && f.delete()) deleted++
+        }
+
+        // 4) Clear Glide cache. Might need this now but we should remove after we fully migrate to Coil
+        // Note to keep this off the main thread
+        Glide.get(application).clearDiskCache()
+
+        deleted
+    }
+
+    fun launchAvatarCleanup(cancelInFlight: Boolean = false) {
+        coroutineScope.launch(Dispatchers.IO) {
+            if (cancelInFlight) {
+                RemoteFileDownloadWorker.cancelAll(application)
+            }
+            val deleted = cleanUpAvatars()
+            Log.d(TAG, "Avatar cache removed: $deleted files")
+        }
+    }
+}

app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt

@@ -1,15 +1,20 @@
 package org.thoughtcrime.securesms.groups
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.launch
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.session.libsession.avatars.AvatarCacheCleaner
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPollerManager
 import org.session.libsession.snode.utilities.await
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
+import org.thoughtcrime.securesms.dependencies.ManagerScope
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -23,6 +28,7 @@ class OpenGroupManager @Inject constructor(
     private val configFactory: ConfigFactoryProtocol,
     private val pollerManager: OpenGroupPollerManager,
     private val lokiAPIDatabase: LokiAPIDatabase,
+    private val avatarCacheCleaner: AvatarCacheCleaner,
 ) {
     suspend fun add(server: String, room: String, publicKey: String) {
         // Fetch the server's capabilities upfront to see if this server is actually running
@@ -59,6 +65,8 @@ class OpenGroupManager @Inject constructor(
             configs.userGroups.eraseCommunity(server, room)
             configs.convoInfoVolatile.eraseCommunity(server, room)
         }
+
+        avatarCacheCleaner.launchAvatarCleanup()
     }
 
     suspend fun addOpenGroup(urlAsString: String) {