Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase OCFileListAdapter Performance #14540

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

package com.nextcloud.utils.extensions

import com.nextcloud.model.OCFileFilterType
import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile

fun FileDataStorageManager.filter(file: OCFile, filterType: OCFileFilterType): List<OCFile> =
if (!file.isRootDirectory) {
getFolderContent(file, false)
} else {
getAllFiles().filter { ocFile ->
when (filterType) {
OCFileFilterType.Shared -> ocFile.isShared
OCFileFilterType.Favorite -> ocFile.isFavorite
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

package com.nextcloud.utils.extensions

import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile

fun List<OCFile>.setEncryptionAttributeForItemId(
fileId: String,
encrypted: Boolean,
storageManager: FileDataStorageManager
) {
find { it.remoteId == fileId }?.let { file ->
file.apply {
isEncrypted = encrypted
setE2eCounter(0L)
storageManager.saveFile(this)
}
}
}

fun List<OCFile>.refreshCommentsCount(remoteId: String) {
find { it.remoteId == remoteId }?.let { file ->
file.unreadCommentsCount = 0
}
}

fun List<OCFile>.getHiddenFilenames(): List<String> {
return filter { it.shouldHide() }.map { it.fileName }
}

fun List<OCFile>.filterHiddenFiles(): List<OCFile> = filterNot { it.isHidden }.distinct()

fun List<OCFile>.filterByMimeType(mimeType: String): List<OCFile> =
filter { it.isFolder || it.mimeType.startsWith(mimeType) }

fun List<OCFile>.limitToPersonalFiles(userId: String): List<OCFile> = filter { file ->
file.ownerId?.let { ownerId ->
ownerId == userId && !file.isSharedWithMe && !file.isGroupFolder
} ?: false
}

fun List<OCFile>.addOfflineOperations(storageManager: FileDataStorageManager, fileId: Long) {
val offlineOperations = storageManager.offlineOperationsRepository.convertToOCFiles(fileId)
if (offlineOperations.isEmpty()) {
return
}

val result = offlineOperations.filter { offlineFile ->
none { file -> file.decryptedRemotePath == offlineFile.decryptedRemotePath }
}

toMutableList().addAll(result)
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import com.nextcloud.client.database.entity.OfflineOperationEntity;
import com.nextcloud.client.jobs.offlineOperations.repository.OfflineOperationsRepository;
import com.nextcloud.client.jobs.offlineOperations.repository.OfflineOperationsRepositoryType;
import com.nextcloud.model.OCFileFilterType;
import com.nextcloud.model.OfflineOperationRawType;
import com.nextcloud.model.OfflineOperationType;
import com.nextcloud.utils.date.DateFormatPattern;
Expand Down Expand Up @@ -2768,27 +2767,4 @@ public boolean isPartOfInternalTwoWaySync(OCFile file) {
}
return false;
}

public List<OCFile> filter(OCFile file, OCFileFilterType filterType) {
if (!file.isRootDirectory()) {
return getFolderContent(file,false);
}

final List<OCFile> result = new ArrayList<>();
final List<OCFile> allFiles = getAllFiles();
for (OCFile ocFile: allFiles) {
boolean condition = false;
if (filterType == OCFileFilterType.Shared) {
condition = ocFile.isShared();
} else if (filterType == OCFileFilterType.Favorite) {
condition = ocFile.isFavorite();
}

if (condition) {
result.add(ocFile);
}
}

return result;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

package com.owncloud.android.ui.adapter

import androidx.recyclerview.widget.DiffUtil
import com.owncloud.android.datamodel.OCFile

class OCFileDiffCallback(private val oldList: List<OCFile>, private val newList: List<OCFile>) : DiffUtil.Callback() {
override fun getOldListSize(): Int = oldList.size
override fun getNewListSize(): Int = newList.size

override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
return oldList[oldItemPosition].remoteId === newList[newItemPosition].remoteId ||
oldList[oldItemPosition].decryptedRemotePath === newList[newItemPosition].decryptedRemotePath
}

override fun areContentsTheSame(oldPosition: Int, newPosition: Int): Boolean {
return oldList[oldPosition].remoteId == newList[newPosition].remoteId &&
oldList[oldPosition].hashCode() == newList[newPosition].hashCode() &&
oldList[oldPosition].fileLength == newList[newPosition].fileLength
}
}
Loading
Loading