Skip to content

fix(oc-file-list): local file indicator edge cases #16705

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.

Sign up for GitHub

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

Merged
alperozturk96 merged 2 commits into from
Mar 18, 2026
Merged

fix(oc-file-list): local file indicator edge cases #16705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4eea09
fix(oc-file-list): local file indicator edge cases
alperozturk96 Mar 18, 2026
c13386d
fix(oc-file-list): local file indicator edge cases
alperozturk96 Mar 18, 2026
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
30 changes: 11 additions & 19 deletions app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,19 @@ interface FileDao {

@Query(
"""
SELECT
EXISTS (
SELECT 1
FROM filelist
WHERE parent = :parentId
AND file_owner = :accountName
AND content_type != '${MimeType.DIRECTORY}'
AND content_type != '${MimeType.WEBDAV_FOLDER}'
)
AND NOT EXISTS (
SELECT 1
FROM filelist
WHERE parent = :parentId
AND file_owner = :accountName
AND content_type != '${MimeType.DIRECTORY}'
AND content_type != '${MimeType.WEBDAV_FOLDER}'
AND media_path IS NULL
)
SELECT NOT EXISTS (
SELECT 1
FROM filelist
WHERE parent = :parentId
AND file_owner = :accountName
AND content_type IS NOT NULL
AND content_type != '${MimeType.DIRECTORY}'
AND content_type != '${MimeType.WEBDAV_FOLDER}'
AND (media_path IS NULL OR TRIM(media_path) = '')
)
"""
)
fun isFolderFullyDownloaded(parentId: Long, accountName: String): Boolean
fun areAllFilesHaveMediaPath(parentId: Long, accountName: String): Boolean

@Query(
"""
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/utils/extensions/FileExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fun Path.toLocalPath(): String = toAbsolutePath().toString()
@Suppress("ReturnCount")
fun String.toFile(): File? {
if (isNullOrEmpty()) {
Log_OC.e(TAG, "given path is null or empty")
Log_OC.w(TAG, "given path is null or empty: $this")
return null
}

Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,19 @@ class OCFileListDelegate(
}

private fun showLocalFileIndicator(file: OCFile, holder: ListViewHolder) {
val isFullyDownloaded = storageManager.fileDao.isFolderFullyDownloaded(file.fileId, user.accountName)
var isFolderDown = false
if (file.isFolder && !file.isEncrypted && file.fileLength != 0L) {
isFolderDown = storageManager.fileDao.areAllFilesHaveMediaPath(file.fileId, user.accountName)
}

val isSyncing = isSynchronizing(file)
val hasConflict = (file.etagInConflict != null)
val isDown = file.isDown

val icon = when {
isSyncing -> R.drawable.ic_synchronizing
hasConflict -> R.drawable.ic_synchronizing_error
isDown || isFullyDownloaded -> R.drawable.ic_synced
isDown || isFolderDown -> R.drawable.ic_synced
else -> null
}

Expand Down
Loading