Skip to content

fix(auto upload): file skip check #16276

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

Open
alperozturk96 wants to merge 2 commits into
base: master
Choose a base branch
from
+33 −25
Open

fix(auto upload): file skip check #16276

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
0e7c557
fix: auto upload file skip check
alperozturk96 Jan 12, 2026
d59829a
update tests
alperozturk96 Jan 12, 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
21 changes: 10 additions & 11 deletions app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,20 +159,19 @@ class FileSystemRepository(private val dao: FileSystemDao, private val context:
return
}

val entity = dao.getFileByPathAndFolder(localPath, syncedFolder.id.toString())
val fileSentForUpload = (entity != null && entity.fileSentForUpload == 1)
if (fileSentForUpload) {
Log_OC.d(TAG, "File was sent for upload, checking if it changed...")
}

val fileModified = (lastModified ?: file.lastModified())
val shouldSkipFileBasedOnFolderSettings = syncedFolder.shouldSkipFile(file, fileModified, creationTime)
if (shouldSkipFileBasedOnFolderSettings) {
if (syncedFolder.shouldSkipFile(file, fileModified, creationTime, fileSentForUpload)) {
return
}

val entity = dao.getFileByPathAndFolder(localPath, syncedFolder.id.toString())
Copy link
Collaborator Author

@alperozturk96 alperozturk96 Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getAutoUploadFilesEntities already returns file needs to be uploaded and if we skip when fileSentForUpload is true, changed files will not be uploaded.

if (entity != null && entity.fileSentForUpload == 1) {
Log_OC.w(
TAG,
"file already uploaded path: $localPath, " +
"syncedFolder: ${syncedFolder.localPath}, ${syncedFolder.id}"
)
return
if (fileSentForUpload) {
Log_OC.d(TAG, "File was sent for upload before but has changed, will re-upload: $localPath")
}

val crc = getFileChecksum(file)
Expand All @@ -182,7 +181,7 @@ class FileSystemRepository(private val dao: FileSystemDao, private val context:
localPath = localPath,
fileIsFolder = if (file.isDirectory) 1 else 0,
fileFoundRecently = System.currentTimeMillis(),
fileSentForUpload = 0,
fileSentForUpload = 0, // Reset to 0 to queue for upload
syncedFolderId = syncedFolder.id.toString(),
crc32 = crc?.toString(),
fileModified = fileModified
Expand Down
21 changes: 15 additions & 6 deletions app/src/main/java/com/nextcloud/utils/extensions/SyncedFolderExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ private const val TAG = "SyncedFolderExtensions"
* Determines whether a file should be skipped during auto-upload based on folder settings.
*/
@Suppress("ReturnCount")
fun SyncedFolder.shouldSkipFile(file: File, lastModified: Long, creationTime: Long?): Boolean {
fun SyncedFolder.shouldSkipFile(
file: File,
lastModified: Long,
creationTime: Long?,
fileSentForUpload: Boolean
): Boolean {
Log_OC.d(TAG, "Checking file: ${file.name}, lastModified=$lastModified, lastScan=$lastScanTimestampMs")

if (isExcludeHidden && file.isHidden) {
Expand All @@ -38,15 +43,19 @@ fun SyncedFolder.shouldSkipFile(file: File, lastModified: Long, creationTime: Lo
return true
}
} else {
Log_OC.w(TAG, "file sent for upload - cannot determine creation time: ${file.absolutePath}")
Log_OC.w(TAG, "file will be inserted to db - cannot determine creation time: ${file.absolutePath}")
return false
}
}

// Skip files that haven't changed since last scan (already processed)
// BUT only if this is not the first scan
if (lastScanTimestampMs != -1L && lastModified < lastScanTimestampMs) {
Log_OC.d(TAG, "Skipping unchanged file (last modified < last scan): ${file.absolutePath}")
// Skip files that haven't changed since last scan ONLY if they were sent for upload
// AND only if this is not the first scan
if (fileSentForUpload && lastScanTimestampMs != -1L && lastModified < lastScanTimestampMs) {
Log_OC.d(
TAG,
"Skipping unchanged file that was already sent for upload (last modified < last scan): " +
"${file.absolutePath}"
)
return true
}

Expand Down
16 changes: 8 additions & 8 deletions app/src/test/java/com/owncloud/android/utils/AutoUploadHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ class AutoUploadHelperTest {
type = MediaFolderType.CUSTOM
)

val shouldSkipOldFile = folder.shouldSkipFile(oldFile, oldFileLastModified, null)
val shouldSkipOldFile = folder.shouldSkipFile(oldFile, oldFileLastModified, null, true)
assertTrue(shouldSkipOldFile)

val shouldSkipNewFile = folder.shouldSkipFile(newFile, currentTime, null)
val shouldSkipNewFile = folder.shouldSkipFile(newFile, currentTime, null, false)
assertTrue(!shouldSkipNewFile)
}

Expand All @@ -157,10 +157,10 @@ class AutoUploadHelperTest {
lastScanTimestampMs = currentTime
}

val shouldSkipOldFile = folder.shouldSkipFile(oldFile, oldFileLastModified, null)
val shouldSkipOldFile = folder.shouldSkipFile(oldFile, oldFileLastModified, null, true)
assertTrue(shouldSkipOldFile)

val shouldSkipNewFile = folder.shouldSkipFile(newFile, currentTime, null)
val shouldSkipNewFile = folder.shouldSkipFile(newFile, currentTime, null, false)
assertTrue(!shouldSkipNewFile)
}

Expand Down Expand Up @@ -305,10 +305,10 @@ class AutoUploadHelperTest {
setEnabled(true, currentTime)
}

val shouldSkipOldFile = folderSkipOld.shouldSkipFile(oldFile, oldFileLastModified, oldFileCreationTime)
val shouldSkipOldFile = folderSkipOld.shouldSkipFile(oldFile, oldFileLastModified, oldFileCreationTime, true)
assertTrue(shouldSkipOldFile)

val shouldSkipNewFile = folderSkipOld.shouldSkipFile(newFile, newFileLastModified, newFileCreationTime)
val shouldSkipNewFile = folderSkipOld.shouldSkipFile(newFile, newFileLastModified, newFileCreationTime, false)
assertTrue(!shouldSkipNewFile)

val folderUploadAll = createTestFolder(
Expand All @@ -320,11 +320,11 @@ class AutoUploadHelperTest {
}

val shouldSkipOldFileIfAlsoUploadExistingFile =
folderUploadAll.shouldSkipFile(oldFile, oldFileLastModified, oldFileCreationTime)
folderUploadAll.shouldSkipFile(oldFile, oldFileLastModified, oldFileCreationTime, true)
assertTrue(!shouldSkipOldFileIfAlsoUploadExistingFile)

val shouldSkipNewFileIfAlsoUploadExistingFile =
folderUploadAll.shouldSkipFile(newFile, newFileLastModified, newFileCreationTime)
folderUploadAll.shouldSkipFile(newFile, newFileLastModified, newFileCreationTime, false)
assertTrue(!shouldSkipNewFileIfAlsoUploadExistingFile)
}
}
Loading