wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/adapter/albums/AlbumsAdapter.kt

@@ -20,8 +20,6 @@ import com.owncloud.android.databinding.AlbumsGridItemBinding
 import com.owncloud.android.databinding.AlbumsListItemBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.datamodel.ThumbnailsCacheManager
-import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.albums.PhotoAlbumEntry
 import com.owncloud.android.utils.DisplayUtils
 
@@ -34,7 +32,6 @@ class AlbumsAdapter(
     private val gridView: Boolean = true
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private var albumList: MutableList<PhotoAlbumEntry> = mutableListOf()
-    private val asyncTasks: MutableList<ThumbnailsCacheManager.ThumbnailGenerationTask> = ArrayList()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = if (gridView) {
         AlbumGridItemViewHolder(AlbumsGridItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
@@ -76,7 +73,6 @@ class AlbumsAdapter(
                 ocLocal = nFile
             }
 
-
             thumbnailGenerator.setThumbnail(ocLocal, gridViewHolder.thumbnail, gridView, true)
         } else {
             gridViewHolder.thumbnail.setImageResource(R.drawable.file_image)
@@ -87,14 +83,7 @@ class AlbumsAdapter(
     }
 
     fun cancelAllPendingTasks() {
-        for (task in asyncTasks) {
-            task.cancel(true)
-            if (task.getMethod != null) {
-                Log_OC.d("AlbumsAdapter", "cancel: abort get method directly")
-                task.getMethod.abort()
-            }
-        }
-        asyncTasks.clear()
+        thumbnailGenerator.fileThumbnailGenerator.cancelPendingTasks()
     }
 
     @SuppressLint("NotifyDataSetChanged")

app/src/main/java/com/owncloud/android/ui/fragment/albums/AlbumSharingBottomSheet.kt

@@ -18,18 +18,16 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.nextcloud.android.common.ui.theme.utils.ColorRole
-import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.utils.date.DateFormatPattern
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.nextcloud.utils.thumbnail.ThumbnailGenerator
 import com.owncloud.android.R
+import com.owncloud.android.databinding.AlbumImageThumbnailBinding
 import com.owncloud.android.databinding.AlbumShareActionBinding
 import com.owncloud.android.databinding.AlbumSharingBottomSheetBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.datamodel.SyncedFolderProvider
-import com.owncloud.android.datamodel.ThumbnailsCacheManager
 import com.owncloud.android.lib.resources.albums.PhotoAlbumEntry
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
@@ -45,20 +43,12 @@ class AlbumSharingBottomSheet(
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 
-    @Inject
-    lateinit var currentUserProvider: CurrentAccountProvider
-
     @Inject
     lateinit var storageManager: FileDataStorageManager
 
-    @Inject
-    lateinit var syncedFolderProvider: SyncedFolderProvider
-
     @Inject
     lateinit var thumbnailGenerator: ThumbnailGenerator
 
-    private val thumbnailAsyncTasks = mutableListOf<ThumbnailsCacheManager.ThumbnailGenerationTask>()
-
     private var _binding: AlbumSharingBottomSheetBinding? = null
     val binding
         get() = _binding!!
@@ -119,7 +109,7 @@ class AlbumSharingBottomSheet(
             return
         }
 
-        thumbnailGenerator.setThumbnail(getOrCreateFile(album), hideVideoOverlay = true, view = binding.albumImageLayout)
+        loadThumbnail(getOrCreateFile(album), binding.albumImageLayout)
     }
 
     private fun showPlaceholder() = with(binding.albumImageLayout) {
@@ -134,6 +124,15 @@ class AlbumSharingBottomSheet(
             remoteId = album.lastPhoto.toString()
         }
 
+    private fun loadThumbnail(file: OCFile, target: AlbumImageThumbnailBinding) {
+        thumbnailGenerator.setThumbnail(
+            file,
+            target.thumbnail,
+            hideVideoOverlay = true,
+            shimmer = target.thumbnailShimmer
+        )
+    }
+
     private fun initializeImageCollage() {
         val files = fileList?.takeIf { it.isNotEmpty() } ?: return
         val collage = this.collage ?: return