From 45cefcda028d0ccc63ec849ad5980c87819ca168 Mon Sep 17 00:00:00 2001 From: Fernando Sanz Date: Thu, 13 Jan 2022 08:06:42 +0100 Subject: [PATCH] The images are displayed correctly in the list. --- .../presentation/adapters/filelist/FileListAdapter.kt | 8 ++++++-- .../ui/files/filelist/MainFileListViewModel.kt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/filelist/FileListAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/filelist/FileListAdapter.kt index 35544339d22..2cfbbd08e0e 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/filelist/FileListAdapter.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/adapters/filelist/FileListAdapter.kt @@ -32,9 +32,11 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.owncloud.android.R +import com.owncloud.android.authentication.AccountUtils import com.owncloud.android.databinding.GridItemBinding import com.owncloud.android.databinding.ItemFileListBinding import com.owncloud.android.databinding.ListFooterBinding +import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.ThumbnailsCacheManager import com.owncloud.android.domain.files.model.OCFile import com.owncloud.android.domain.files.model.OCFooterFile @@ -51,6 +53,8 @@ class FileListAdapter( ) : RecyclerView.Adapter() { private var files = mutableListOf() + private var account = AccountUtils.getCurrentOwnCloudAccount(context) + private var storageManager: FileDataStorageManager = FileDataStorageManager(context, account, context.contentResolver) fun updateFileList(filesToAdd: List) { val diffUtilCallback = FileListDiffCallback(oldList = files, newList = filesToAdd) @@ -217,14 +221,14 @@ class FileListAdapter( if (file.needsToUpdateThumbnail) { // generate new Thumbnail if (ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, fileIcon)) { - /*val task = ThumbnailsCacheManager.ThumbnailGenerationTask(fileIcon, storageManager, account) + val task = ThumbnailsCacheManager.ThumbnailGenerationTask(fileIcon, storageManager, account) val asyncDrawable = ThumbnailsCacheManager.AsyncThumbnailDrawable(context.resources, thumbnail, task) // If drawable is not visible, do not update it. if (asyncDrawable.minimumHeight > 0 && asyncDrawable.minimumWidth > 0) { fileIcon.setImageDrawable(asyncDrawable) } - task.execute(file)*/ + task.execute(file) } } diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListViewModel.kt index 909fe92905b..730e980dd8c 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListViewModel.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListViewModel.kt @@ -26,6 +26,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.owncloud.android.data.preferences.datasources.SharedPreferencesProvider +import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.db.PreferenceManager import com.owncloud.android.domain.UseCaseResult import com.owncloud.android.domain.files.model.OCFile @@ -141,7 +142,7 @@ class MainFileListViewModel( refreshFilesList(file.remotePath) } - fun getFile(): OCFile{ + fun getFile(): OCFile { return file } @@ -159,7 +160,6 @@ class MainFileListViewModel( fun isGridModeSetAsPreferred() = sharedPreferencesProvider.getBoolean(RECYCLER_VIEW_PREFERRED, false) - fun sortList(files: List): List { val sortOrderSaved = PreferenceManager.getSortOrder(contextProvider.getContext(), FileStorageUtils.FILE_DISPLAY_SORT) val ascendingModeSaved = PreferenceManager.getSortAscending(contextProvider.getContext(), FileStorageUtils.FILE_DISPLAY_SORT)