From 43666075bb450f07d860d93b0ee632839a40b461 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 19 Aug 2026 15:21:26 +0200 Subject: [PATCH 1/4] fix(file-list): db pagination Signed-off-by: alperozturk96 # Conflicts: # app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt # Conflicts: # app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt --- .../nextcloud/client/database/dao/FileDao.kt | 36 ++++++++++++++----- .../datamodel/FileDataStorageManager.java | 2 +- .../OCFileListAdapterDataProviderImpl.kt | 3 +- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt index cc1767781f57..93c0d9e45ef3 100644 --- a/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt +++ b/app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt @@ -41,11 +41,31 @@ interface FileDao { @Query("SELECT * FROM filelist WHERE remote_id = :remoteId LIMIT 1") suspend fun getFileByRemoteId(remoteId: String): FileEntity? - @Query("SELECT * FROM filelist WHERE parent = :parentId ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER}") - fun getFolderContent(parentId: Long): List + @Query( + """ + SELECT ${ProviderTableMeta._ID} + FROM filelist + WHERE parent = :parentId + ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER} + """ + ) + fun getFolderContentIds(parentId: Long): List - @Query("SELECT * FROM filelist WHERE parent = :parentId ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER}") - suspend fun getFolderContentSuspended(parentId: Long): List + @Query( + """ + SELECT ${ProviderTableMeta._ID} + FROM filelist + WHERE parent = :parentId + ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER} + """ + ) + suspend fun getFolderContentIdsSuspended(parentId: Long): List + + @Query("SELECT * FROM filelist WHERE ${ProviderTableMeta._ID} IN (:ids)") + fun getFilesByIds(ids: List): List + + @Query("SELECT * FROM filelist WHERE ${ProviderTableMeta._ID} IN (:ids)") + suspend fun getFilesByIdsSuspended(ids: List): List @Query( "SELECT * FROM filelist WHERE modified >= :startDate" + @@ -145,7 +165,7 @@ interface FileDao { @Query( """ - SELECT * + SELECT ${ProviderTableMeta._ID} FROM filelist WHERE file_owner = :accountName AND ( @@ -156,18 +176,18 @@ interface FileDao { ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER} """ ) - suspend fun getSharedFiles(accountName: String): List + suspend fun getSharedFileIds(accountName: String): List @Query( """ - SELECT * + SELECT ${ProviderTableMeta._ID} FROM filelist WHERE file_owner = :fileOwner AND favorite = 1 ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER} """ ) - suspend fun getFavoriteFiles(fileOwner: String): List + suspend fun getFavoriteFileIds(fileOwner: String): List @Query( """ diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java index 42d5db1feb35..ab48c38862fb 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -1216,7 +1216,7 @@ private List getFolderContent(long parentId, boolean onlyOnDevice) { Log_OC.d(TAG, "getFolderContent - start"); List folderContent = new ArrayList<>(); - List files = fileDao.getFolderContent(parentId); + List files = FileDataStorageManagerExtensionsKt.getFolderContentEntities(this, parentId); for (FileEntity fileEntity : files) { OCFile child = createFileInstance(fileEntity); if (!onlyOnDevice || child.existsOnDevice()) { diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt b/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt index 3f09d4d6e276..b389203b6370 100644 --- a/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt +++ b/app/src/main/java/com/owncloud/android/datamodel/OCFileListAdapterDataProviderImpl.kt @@ -8,6 +8,7 @@ package com.owncloud.android.datamodel import com.nextcloud.client.database.entity.FileEntity +import com.nextcloud.utils.extensions.getFolderContentEntitiesSuspended import com.owncloud.android.ui.adapter.helper.OCFileListAdapterDataProvider @Suppress("ReturnCount") @@ -17,7 +18,7 @@ class OCFileListAdapterDataProviderImpl(private val storageManager: FileDataStor storageManager.offlineOperationsRepository.convertToOCFiles(id) override suspend fun getFolderContent(id: Long): List = - storageManager.fileDao.getFolderContentSuspended(id) + storageManager.getFolderContentEntitiesSuspended(id) override fun createFileInstance(entity: FileEntity): OCFile = storageManager.createFileInstance(entity) } From 730c2a197ad30bc159437c580f8ab2989e5140b7 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 9 Sep 2026 09:43:36 +0200 Subject: [PATCH 2/4] wip Signed-off-by: alperozturk96 --- .../FileDataStorageManagerExtensions.kt | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt b/app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt index fab3fe145c54..361fbd2554cb 100644 --- a/app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt +++ b/app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt @@ -8,6 +8,7 @@ package com.nextcloud.utils.extensions import com.nextcloud.client.database.dao.FileDao +import com.nextcloud.client.database.entity.FileEntity import com.nextcloud.client.database.entity.model.ShareeKey import com.nextcloud.client.database.entity.toOCCapability import com.owncloud.android.datamodel.FileDataStorageManager @@ -249,3 +250,28 @@ private fun FileDao.moveFilesInDb( updateAll(updated) return originalMediaPaths } + +private const val FILE_ID_CHUNK_SIZE = 100 + +private fun List.toEntitiesInOrder(loadChunk: (List) -> List): List { + val byId = chunked(FILE_ID_CHUNK_SIZE).flatMap(loadChunk).associateBy { it.id } + return mapNotNull { byId[it] } +} + +fun FileDataStorageManager.getFolderContentEntities(parentId: Long): List = + fileDao.getFolderContentIds(parentId).toEntitiesInOrder(fileDao::getFilesByIds) + +suspend fun FileDataStorageManager.getFolderContentEntitiesSuspended(parentId: Long): List = + fileDao.getFolderContentIdsSuspended(parentId).toEntitiesInOrderSuspended(this) + +suspend fun FileDataStorageManager.getSharedFileEntities(accountName: String): List = + fileDao.getSharedFileIds(accountName).toEntitiesInOrderSuspended(this) + +suspend fun FileDataStorageManager.getFavoriteFileEntities(accountName: String): List = + fileDao.getFavoriteFileIds(accountName).toEntitiesInOrderSuspended(this) + +private suspend fun List.toEntitiesInOrderSuspended(storageManager: FileDataStorageManager): List { + val entities = chunked(FILE_ID_CHUNK_SIZE).flatMap { storageManager.fileDao.getFilesByIdsSuspended(it) } + val byId = entities.associateBy { it.id } + return mapNotNull { byId[it] } +} From 938f1c1ecd76042c6bb3fc1ea0059ae87de244ee Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 29 Sep 2026 12:26:36 +0200 Subject: [PATCH 3/4] wip Signed-off-by: alperozturk96 --- .../owncloud/android/ui/fragment/OCFileListSearchTask.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt index 8afb099edd8e..5676889654d3 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt @@ -8,14 +8,16 @@ */ package com.owncloud.android.ui.fragment +import android.accounts.Account import android.annotation.SuppressLint import android.app.Activity -import android.accounts.Account import android.content.ContentValues import androidx.lifecycle.lifecycleScope import com.nextcloud.client.account.User import com.nextcloud.client.preferences.AppPreferences import com.nextcloud.utils.SnackbarUtil +import com.nextcloud.utils.extensions.getFavoriteFileEntities +import com.nextcloud.utils.extensions.getSharedFileEntities import com.nextcloud.utils.share.UnifiedShareSharees import com.owncloud.android.R import com.owncloud.android.datamodel.FileDataStorageManager @@ -114,9 +116,9 @@ class OCFileListSearchTask( fragment: OCFileListFragment ): List { val files = if (searchType == SearchRemoteOperation.SearchType.SHARED_FILTER) { - storageManager.fileDao.getSharedFiles(currentUser.accountName) + storageManager.getSharedFileEntities(currentUser.accountName) } else { - storageManager.fileDao.getFavoriteFiles(currentUser.accountName) + storageManager.getFavoriteFileEntities(currentUser.accountName) }.mapNotNull { storageManager.createFileInstance(it) } return sortSearchData(files, fragmentSearchType, fragment) From e446ab4c956f3d755ffc2aaa368e6397f5c7a43d Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 29 Sep 2026 12:27:14 +0200 Subject: [PATCH 4/4] use kt durations Signed-off-by: alperozturk96 --- .../com/owncloud/android/ui/fragment/OCFileListSearchTask.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt index 5676889654d3..e791d6c6330d 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt @@ -44,6 +44,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.coroutines.withTimeoutOrNull import java.lang.ref.WeakReference +import kotlin.time.Duration.Companion.milliseconds @Suppress("LongParameterList", "ReturnCount", "TooGenericExceptionCaught") @SuppressLint("NotifyDataSetChanged") @@ -150,7 +151,7 @@ class OCFileListSearchTask( val context = fragment.context ?: return null return try { - withTimeoutOrNull(taskTimeout) { + withTimeoutOrNull(taskTimeout.milliseconds) { remoteOperation.execute(currentUser, context) } ?: remoteOperation.executeNextcloudClient(currentUser, context) } catch (e: Exception) {