Fix conflicts for offline uploads when uploading same file again by daniele-verducci · Pull Request #17590 · nextcloud/android

daniele-verducci · 2026-09-08T16:27:54Z

Fixes the following two problems:

Conflict message being shown for offline uploads when the offline-uploaded file is the same as the remote

Fixes the conflict message being shown for offline uploads when the offline-uploaded file is the same as the remote. This makes the behavior aligned with what happens online.

How to repro:

Create a folder
Upload a file
Go offline (e.g. airplane mode)
Upload a second time the same, unmodified file
Go online
A conflict message is shown

Now execute the same actions in a new folder without going offline:

A conflict message is NOT shown

This is because the offline upload erases the etag_on_server field for the already existing db entry.
This PR fixes this issue.

Remote file overwritted by local file when selecting "keep both" after offline upload

This PR does fix this this second issue: #17589

How to repro:

Create a folder
Upload a file
Go offline (e.g. airplane mode)
Upload a second time the same, unmodified file
Go online
A conflict notification is shown
Click resolve, note the dialog: it says folder conflict, and the dates and sizes are wrong
Select both versions and click ok
Notice the remote version is overwritten by the local one. At the end you are left with a single file in the folder instead of two.

🏁 Checklist

⛑️ Tests (unit and/or integration) are included or not needed
🔙 Backport requests are created or not needed: /backport to stable-xx.x
📅 Milestone is set
🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

🤖 AI (if applicable)

The content of this PR was partly or fully generated using AI (N/A)

daniele-verducci · 2026-09-08T16:30:38Z

@tobiasKaminsky should this be in milestone 35 or 36?

github-actions · 2026-09-08T16:36:04Z

APK file: https://github.com/nextcloud/android/actions/runs/34251212640/artifacts/10066358893
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
(please click on link to get QR code displayed)

daniele-verducci · 2026-09-09T16:00:25Z

Hey @alperozturk96 , as anticipated I fixed also the missing case, so I re-requested your review. You can check just the last 4 (new) commits.
Basically, before the last 3 commits :

Create a folder
Upload a file
Go offline (e.g. airplane mode)
Upload a second time the same, unmodified file
Go online
A conflict notification is shown
Click resolve, note the dialog: it says folder conflict, and the dates and sizes are wrong
Select both versions and click ok
Notice the remote version is overwritten by the local one. At the end you are left with a single file in the folder instead of two.

So, the last commits fixes the dialog content and the overwrite. If approved, will close #17589 .

Thank you!

alperozturk96 · 2026-09-10T09:16:59Z

/backport to stable-35.0.x

github-actions · 2026-09-10T10:46:52Z

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

github-actions · 2026-09-10T11:39:39Z

APK file: https://github.com/nextcloud/android/actions/runs/34466906550/artifacts/10150066862
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
(please click on link to get QR code displayed)

codecov · 2026-09-15T11:20:02Z

Codecov Report

❌ Patch coverage is 2.77778% with 70 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...a/com/nextcloud/utils/extensions/FileExtensions.kt	0.00%	20 Missing ⚠️
...ui/dialog/conflict/ConflictResolveDialogFactory.kt	0.00%	17 Missing ⚠️
...erations/repository/OfflineOperationsRepository.kt	0.00%	13 Missing ⚠️
...loud/android/datamodel/FileDataStorageManager.java	7.69%	12 Missing ⚠️
...ud/android/ui/activity/ConflictsResolveActivity.kt	0.00%	8 Missing ⚠️

📢 Thoughts on this report? Let us know!

github-actions · 2026-09-15T11:23:17Z

📱 QA build


Download	app-qa-debug.apk
QR code	Open the QR code for this download
Commit	`c2a8b76`
Version	`17590`
Available until	7 days after this build

The QA build installs alongside a released Nextcloud app, so you can keep
using your existing install while testing.

Downloading the file requires a GitHub account, so open this link on the
device you want to test on, or transfer the APK to it.

daniele-verducci · 2026-09-16T07:24:52Z

Hey @alperozturk96 , thanks for the review and the suggestion! I applied them, now I wait for the CI to run.

alperozturk96 · 2026-09-17T07:33:41Z

+    val remoteModified = this.modificationTimestamp / MS_IN_SECOND // Unix time in milliseconds
+    remoteName == localName &&
+        remoteSize == localSize &&
+        remoteCreated == localCreated &&


How come remoteCreated and localCreated time can be same? We receive the remote file from server then write into our DB.

Scenario 1:

File created from other client, remote creating date written in the server's DB and Android client writes that and compare against the potentially exists local file this can be same file but creating time can be different.

Scenario 2:

File created from Android client does server stores Android's creation time exactly or stores based on server's creation time?

Good question. Not sure about this, i looked into it with the debugger:

file created from other client and overwritten by android client while offline: remoteCreated = 0, localCreated = 1789640828

file created from android client, then re-uploaded while offline: remoteCreated = 1789392966, localCreated = 1789392966
(This is called by createPendingFile, so it's never called if the app is online)

I checked why remoteCreated isn't populated: it is, but it's already 0 in RemoteFile