Feature: Thumbnail Loading Fix & Caching Improvements

Author: zerox80

opencloudApp/src/main/java/eu/opencloud/android/datamodel/ThumbnailsCacheManager.java

@@ -23,17 +23,13 @@ import android.accounts.Account
 import android.view.MenuItem
 import android.widget.ImageView
 import eu.opencloud.android.R
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import coil.load
+import eu.opencloud.android.MainApp.Companion.appContext
+import eu.opencloud.android.presentation.thumbnails.ThumbnailsRequester
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 
 class AvatarUtils : KoinComponent {
 
-    private val avatarManager: AvatarManager by inject()
-
     /**
      * Show the avatar corresponding to the received account in an {@ImageView}.
      * <p>
@@ -56,20 +52,11 @@ class AvatarUtils : KoinComponent {
         fetchIfNotCached: Boolean = false,
         displayRadius: Float
     ) {
-        // Tech debt: Move this to a viewModel and use its viewModelScope instead
-        CoroutineScope(Dispatchers.IO).launch {
-            val drawable = avatarManager.getAvatarForAccount(
-                account = account,
-                fetchIfNotCached = fetchIfNotCached,
-                displayRadius = displayRadius
-            )
-            withContext(Dispatchers.Main) {
-                if (drawable != null) {
-                    imageView.setImageDrawable(drawable)
-                } else {
-                    imageView.setImageResource(R.drawable.ic_account_circle)
-                }
-            }
+        val uri = ThumbnailsRequester.getAvatarUri(account)
+        imageView.load(uri, ThumbnailsRequester.getCoilImageLoader()) {
+            placeholder(R.drawable.ic_account_circle)
+            error(R.drawable.ic_account_circle)
+            transformations(coil.transform.CircleCropTransformation())
         }
     }
 
@@ -79,19 +66,17 @@ class AvatarUtils : KoinComponent {
         fetchIfNotCached: Boolean = false,
         displayRadius: Float
     ) {
-        CoroutineScope(Dispatchers.IO).launch {
-            val drawable = avatarManager.getAvatarForAccount(
-                account = account,
-                fetchIfNotCached = fetchIfNotCached,
-                displayRadius = displayRadius
+        val uri = ThumbnailsRequester.getAvatarUri(account)
+        val imageLoader = ThumbnailsRequester.getCoilImageLoader()
+        val request = coil.request.ImageRequest.Builder(appContext)
+            .data(uri)
+            .target(
+                onStart = { menuItem.setIcon(R.drawable.ic_account_circle) },
+                onSuccess = { result -> menuItem.icon = result },
+                onError = { menuItem.setIcon(R.drawable.ic_account_circle) }
             )
-            withContext(Dispatchers.Main) {
-                if (drawable != null) {
-                    menuItem.icon = drawable
-                } else {
-                    menuItem.setIcon(R.drawable.ic_account_circle)
-                }
-            }
-        }
+            .transformations(coil.transform.CircleCropTransformation())
+            .build()
+        imageLoader.enqueue(request)
     }
 }

opencloudApp/src/main/java/eu/opencloud/android/presentation/avatar/AvatarManager.kt

@@ -40,8 +40,10 @@ import androidx.work.WorkInfo
 import com.google.android.material.snackbar.Snackbar
 import eu.opencloud.android.MainApp
 import eu.opencloud.android.R
+import coil.load
 import eu.opencloud.android.databinding.FileDetailsFragmentBinding
-import eu.opencloud.android.datamodel.ThumbnailsCacheManager
+
+import eu.opencloud.android.presentation.thumbnails.ThumbnailsRequester
 import eu.opencloud.android.domain.exceptions.AccountNotFoundException
 import eu.opencloud.android.domain.exceptions.InstanceNotConfiguredException
 import eu.opencloud.android.domain.exceptions.TooEarlyException
@@ -428,21 +430,10 @@ class FileDetailsFragment : FileFragment() {
                 }
             }
             if (ocFile.isImage) {
-                val tagId = ocFile.remoteId.toString()
-                var thumbnail: Bitmap? = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId)
-                if (thumbnail != null && !ocFile.needsToUpdateThumbnail) {
-                    imageView.setImageBitmap(thumbnail)
-                } else {
-                    // generate new Thumbnail
-                    if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(ocFile, imageView)) {
-                        val task = ThumbnailsCacheManager.ThumbnailGenerationTask(imageView, fileDetailsViewModel.getAccount())
-                        if (thumbnail == null) {
-                            thumbnail = ThumbnailsCacheManager.mDefaultImg
-                        }
-                        val asyncDrawable = ThumbnailsCacheManager.AsyncThumbnailDrawable(MainApp.appContext.resources, thumbnail, task)
-                        imageView.setImageDrawable(asyncDrawable)
-                        task.execute(ocFile)
-                    }
+                imageView.load(ThumbnailsRequester.getPreviewUriForFile(OCFileWithSyncInfo(ocFile, null), fileDetailsViewModel.getAccount()), ThumbnailsRequester.getCoilImageLoader()) {
+                    placeholder(MimetypeIconUtil.getFileTypeIconId(ocFile.mimeType, ocFile.fileName))
+                    error(MimetypeIconUtil.getFileTypeIconId(ocFile.mimeType, ocFile.fileName))
+                    crossfade(true)
                 }
             } else {
                 // Name of the file, to deduce the icon to use in case the MIME type is not precise enough