Skip to content

[stable-3.35] fix(auto-upload): handle existing sync conflicts #16292

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
Jan 14, 2026
Merged

[stable-3.35] fix(auto-upload): handle existing sync conflicts #16292

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
f4d0fa0
fix(auto-upload): handle existing sync conflicts
alperozturk96 Jan 12, 2026
7ad6bd9
fix(auto-upload): codacy
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
24 changes: 21 additions & 3 deletions app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.owncloud.android.datamodel.SyncedFolder
import com.owncloud.android.datamodel.SyncedFolderProvider
import com.owncloud.android.datamodel.UploadsStorageManager
import com.owncloud.android.db.OCUpload
import com.owncloud.android.db.UploadResult
import com.owncloud.android.lib.common.OwnCloudAccount
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
import com.owncloud.android.lib.common.utils.Log_OC
Expand Down Expand Up @@ -302,7 +303,14 @@ class AutoUploadWorker(
)

try {
var (uploadEntity, upload) = createEntityAndUpload(user, localPath, remotePath)
val result = createEntityAndUpload(user, localPath, remotePath)
if (result == null) {
repository.markFileAsHandled(localPath, syncedFolder)
Log_OC.d(TAG, "Marked file as handled due to existing conflict: $localPath")
continue
}

var (uploadEntity, upload) = result

// if local file deleted, upload process cannot be started or retriable thus needs to be removed
if (path.isEmpty() || !file.exists()) {
Expand Down Expand Up @@ -331,7 +339,7 @@ class AutoUploadWorker(
)

if (result.isSuccess) {
repository.markFileAsUploaded(localPath, syncedFolder)
repository.markFileAsHandled(localPath, syncedFolder)
Log_OC.d(TAG, "✅ upload completed: $localPath")
} else {
Log_OC.e(
Expand Down Expand Up @@ -375,7 +383,11 @@ class AutoUploadWorker(
uploadsStorageManager.removeUpload(upload)
}

private fun createEntityAndUpload(user: User, localPath: String, remotePath: String): Pair<UploadEntity, OCUpload> {
private fun createEntityAndUpload(
user: User,
localPath: String,
remotePath: String
): Pair<UploadEntity, OCUpload>? {
val (needsCharging, needsWifi, uploadAction) = getUploadSettings(syncedFolder)
Log_OC.d(TAG, "creating oc upload for ${user.accountName}")

Expand All @@ -386,6 +398,12 @@ class AutoUploadWorker(
accountName = user.accountName
)

val lastUploadResult = uploadEntity?.lastResult?.let { UploadResult.fromValue(it) }
if (lastUploadResult == UploadResult.SYNC_CONFLICT) {
Log_OC.w(TAG, "Conflict already exists, skipping auto-upload: $localPath")
return null
}

val upload = (
uploadEntity?.toOCUpload(null) ?: OCUpload(
localPath,
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -63,7 +63,7 @@ class FileSystemRepository(private val dao: FileSystemDao, private val context:
return filtered
}

suspend fun markFileAsUploaded(localPath: String, syncedFolder: SyncedFolder) {
suspend fun markFileAsHandled(localPath: String, syncedFolder: SyncedFolder) {
val syncedFolderIdStr = syncedFolder.id.toString()

try {
Expand Down
Loading