feat: Add caching to avatar

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

app/src/main/java/com/nextcloud/talk/profile/AvatarSection.kt

@@ -6,6 +6,7 @@
  */
 package com.nextcloud.talk.profile
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -20,6 +21,8 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -30,20 +33,58 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import coil.annotation.ExperimentalCoilApi
 import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.nextcloud.talk.R
 import com.nextcloud.talk.utils.ApiUtils
 
+@OptIn(ExperimentalCoilApi::class)
 @Composable
 private fun AvatarImage(state: ProfileUiState, avatarSize: Dp) {
+    val context = LocalContext.current
     val user = state.currentUser
-    val url = ApiUtils.getUrlForAvatar(user?.baseUrl,state.currentUser?.userId, true)
-    val model = ImageRequest.Builder(LocalContext.current)
-        .data(url)
-        .crossfade(true)
-        .build()
-    
+    val isDark = isSystemInDarkTheme()
+    val url = ApiUtils.getUrlForAvatar(user?.baseUrl, user?.userId, requestBigSize = true, darkMode = isDark)
+    val cachePolicy = if (state.avatarRefreshKey > 0) CachePolicy.WRITE_ONLY else CachePolicy.ENABLED
+    val model = remember(url, state.avatarRefreshKey) {
+        ImageRequest.Builder(context)
+            .data(url)
+            .memoryCachePolicy(cachePolicy)
+            .diskCachePolicy(cachePolicy)
+            .crossfade(true)
+            .build()
+    }
+    LaunchedEffect(state.avatarRefreshKey) {
+        if (state.avatarRefreshKey > 0) {
+            val imageLoader = context.imageLoader
+            // Evict both theme variants so a subsequent dark/light switch never shows
+            // a stale avatar regardless of which theme was active during the upload.
+            val urlLight = ApiUtils.getUrlForAvatar(user?.baseUrl, user?.userId, requestBigSize = true, darkMode = false)
+            val urlDark  = ApiUtils.getUrlForAvatar(user?.baseUrl, user?.userId, requestBigSize = true, darkMode = true)
+            listOf(urlLight, urlDark).forEach { variantUrl ->
+                imageLoader.memoryCache?.let { cache ->
+                    cache.keys.filter { it.key == variantUrl }.forEach { cache.remove(it) }
+                }
+                imageLoader.diskCache?.remove(variantUrl)
+            }
+            // Always prefetch the OTHER theme URL so a subsequent theme switch shows the correct
+            // avatar immediately:
+            // - Upload/camera/choose: server returns the same image for both themes.
+            // - Delete: server returns theme-aware generated avatars that differ per theme,
+            //   so each must be fetched and cached independently.
+            val otherUrl = if (isDark) urlLight else urlDark
+            imageLoader.enqueue(
+                ImageRequest.Builder(context)
+                    .data(otherUrl)
+                    .memoryCachePolicy(CachePolicy.WRITE_ONLY)
+                    .diskCachePolicy(CachePolicy.WRITE_ONLY)
+                    .build()
+            )
+        }
+    }
     AsyncImage(
         model = model,
         contentDescription = stringResource(R.string.avatar),

app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt

@@ -560,7 +560,8 @@ class ProfileActivity : BaseActivity() {
 
                 override fun onNext(genericOverall: GenericOverall) {
                     profileUiState = profileUiState.copy(
-                        avatarRefreshKey = profileUiState.avatarRefreshKey + 1
+                        avatarRefreshKey = profileUiState.avatarRefreshKey + 1,
+                        avatarIsDeleted = true
                     )
                 }
 
@@ -591,7 +592,8 @@ class ProfileActivity : BaseActivity() {
 
                 override fun onNext(genericOverall: GenericOverall) {
                     profileUiState = profileUiState.copy(
-                        avatarRefreshKey = profileUiState.avatarRefreshKey + 1
+                        avatarRefreshKey = profileUiState.avatarRefreshKey + 1,
+                        avatarIsDeleted = false
                     )
                 }
 

app/src/main/java/com/nextcloud/talk/profile/ProfileState.kt

@@ -25,8 +25,11 @@ data class ProfileUiState(
     val displayName: String = "",
     val baseUrl: String = "",
     val currentUser: User? = null,
-    /** Increment to tell the avatar AndroidView to reload (e.g. after upload/delete). */
+    /** Increment to tell the avatar composable to reload (e.g. after upload/delete). */
     val avatarRefreshKey: Int = 0,
+    /** True when the most recent avatar action was a delete (server-generated avatars differ per
+     *  theme); false for upload/choose/camera (same image for both themes). */
+    val avatarIsDeleted: Boolean = false,
     val isEditMode: Boolean = false,
     val showAvatarButtons: Boolean = false,
     val showProfileEnabledCard: Boolean = false,