fix(upload-list): handle conflict actions by alperozturk96 · Pull Request #16819 · nextcloud/android

alperozturk96 · 2026-04-09T09:20:41Z

Issue

On Android, we are showing conflicts based on the stored last upload result, but this is wrong because the server can change at any moment. As a result, we may display an incorrect status, and the user might try to open the conflict resolution dialog even though it’s unnecessary, perhaps the file no longer exists on the remote server or has been moved.

Flow

First check remote path from OCUpload via ReadFileOperation -> if file not there remove conflict error and allow user to retry upload

If file exists on remote and same -> if file not there remove conflict error and allow user to retry upload

If file exists and different -> show conflict resolve dialog

Changes

Extracts isSame logic since its necessary for this PR as well.
Implements UploadListAdapterHelper, UploadListAdapterAction since needed for handling conflicts and not bloating the adapter logic. Also we need to implement other actions as well in future.
Adds correct messages that reflects current state of the upload and action.
Adds UploadFileOperationFactory since huge constructor needs to be repeated for each file

Demo - if conflict exists

Screen_recording_20260409_150419.webm

Demo - if conflict not exists anymore (e.g. file moved or removed from server)

Screen_recording_20260409_150442.webm

alperozturk96 · 2026-04-09T09:21:24Z

/backport to stable-33.1.0

alperozturk96 · 2026-04-09T13:07:18Z

    <string name="upload_local_storage_full">Local storage full</string>
    <string name="upload_old_android">Encryption is only possible with &gt;= Android 5.0</string>
-    <string name="upload_sync_conflict">Sync conflict, please resolve manually</string>
+    <string name="upload_sync_conflict_checking">Checking for upload conflicts…</string>


@kra-mo Please share your feedback regarding wording :)

github-actions · 2026-04-09T13:46:08Z

APK file: https://github.com/nextcloud/android/actions/runs/24192202894/artifacts/6350914432
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)

github-actions · 2026-04-10T11:23:14Z

APK file: https://github.com/nextcloud/android/actions/runs/24240286482/artifacts/6369848734
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)

pr is updated. please check shared flow.

github-actions · 2026-04-15T09:45:06Z

APK file: https://github.com/nextcloud/android/actions/runs/24447178861/artifacts/6447528665
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)

github-actions · 2026-04-15T10:01:43Z

APK file: https://github.com/nextcloud/android/actions/runs/24447963945/artifacts/6447832758
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)

pr is updated

github-actions · 2026-04-15T11:55:24Z

Codacy

SpotBugs

Category	Base	New
Bad practice	35	35
Correctness	69	69
Dodgy code	226	226
Experimental	1	1
Internationalization	7	7
Malicious code vulnerability	2	2
Multithreaded correctness	34	34
Performance	42	42
Security	16	16
Total	432	432

github-actions · 2026-04-15T11:57:46Z

APK file: https://github.com/nextcloud/android/actions/runs/24452793311/artifacts/6449807124
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)

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Co-authored-by: Laura Kramolis <git@kramo.page> Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

github-actions · 2026-04-15T13:06:35Z

test-Unit test failed, but no output was generated. Maybe a preliminary stage failed.

github-actions · 2026-04-15T13:12:32Z

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

github-actions · 2026-04-15T13:29:30Z

APK file: https://github.com/nextcloud/android/actions/runs/24455894175/artifacts/6451533794
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)

alperozturk96 added this to the Nextcloud App 33.1.0 milestone Apr 9, 2026

alperozturk96 added the ux-enhancement Improvements that refine user interactions, accessibility, or overall usability label Apr 9, 2026

backportbot bot added the backport-request label Apr 9, 2026

alperozturk96 commented Apr 9, 2026

View reviewed changes

alperozturk96 requested a review from tobiasKaminsky April 9, 2026 13:07

alperozturk96 added the 3. to review label Apr 9, 2026

alperozturk96 linked an issue Apr 9, 2026 that may be closed by this pull request

Auto-upload conflicts, yet again -- this is a never ending problem #16818

Closed

4 tasks

nextcloud deleted a comment from github-actions bot Apr 9, 2026

This was referenced Apr 9, 2026

Auto-upload conflicts, yet again -- this is a never ending problem #16818

Closed

Auto upload conflict detection not working correctly #16049

Closed

alperozturk96 linked an issue Apr 9, 2026 that may be closed by this pull request

Auto upload conflict detection not working correctly #16049

Closed

4 tasks

alperozturk96 added the feature: auto upload label Apr 9, 2026

kra-mo previously requested changes Apr 10, 2026

View reviewed changes

Comment thread app/src/main/res/values/strings.xml

Comment thread app/src/main/res/values/strings.xml Outdated

Comment thread app/src/main/res/values/strings.xml

alperozturk96 requested a review from kra-mo April 10, 2026 11:27

kra-mo approved these changes Apr 10, 2026

View reviewed changes

alperozturk96 commented Apr 13, 2026

View reviewed changes

Comment thread app/src/main/java/com/owncloud/android/ui/adapter/uploadList/UploadListAdapter.kt

tobiasKaminsky previously requested changes Apr 15, 2026

View reviewed changes

Comment thread ...ain/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterActionHandler.kt

Comment thread ...ain/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterActionHandler.kt

alperozturk96 force-pushed the fix/upload-list-conflict-handling branch from 8a3b895 to 92f1763 Compare April 15, 2026 09:10

alperozturk96 force-pushed the fix/upload-list-conflict-handling branch from bf93cfa to 8b8a7ce Compare April 15, 2026 11:48

alperozturk96 requested a review from tobiasKaminsky April 15, 2026 11:48

alperozturk96 and others added 9 commits April 15, 2026 14:54

fix(upload-list): handle conflict actions

616c1c8

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

fix(upload-list): handle conflict actions

f856950

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

fix(upload-list): handle conflict actions

2d9aa7f

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

fix(upload-list): handle conflict actions

4f13083

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

wip

650144f

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Update app/src/main/res/values/strings.xml

04dea79

Co-authored-by: Laura Kramolis <git@kramo.page> Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>

wip

ee02b00

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

webDavParentPath

1899ca7

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

webDavParentPath

177d4c0

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

alperozturk96 force-pushed the fix/upload-list-conflict-handling branch from 8b8a7ce to 177d4c0 Compare April 15, 2026 12:54

fix codacy

1c88f94

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

alperozturk96 merged commit 09f4102 into master Apr 15, 2026
6 of 8 checks passed

alperozturk96 deleted the fix/upload-list-conflict-handling branch April 15, 2026 13:00

backportbot bot mentioned this pull request Apr 15, 2026

[stable-33.1.0] fix(upload-list): handle conflict actions #16858

Merged

backportbot bot removed the backport-request label Apr 15, 2026

Uh oh!

Conversation

alperozturk96 commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue

Flow

Changes

Demo - if conflict exists

Demo - if conflict not exists anymore (e.g. file moved or removed from server)

Uh oh!

alperozturk96 commented Apr 9, 2026

Uh oh!

alperozturk96 Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 10, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

github-actions bot commented Apr 15, 2026

Codacy

SpotBugs

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

alperozturk96 commented Apr 9, 2026 •

edited

Loading

alperozturk96 Apr 9, 2026 •

edited

Loading