Fix conflicts for offline uploads when uploading same file again

[daniele-verducci]

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.

This PR does NOT fix #17589

🏁 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]

@tobiasKaminsky should this be in milestone 35 or 36?

[github-actions]

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]

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!

[github-actions]

Codacy

SpotBugs

Category	Base	New
Bad practice	35	35
Correctness	58	58
Dodgy code	195	195
Experimental	1	1
Malicious code vulnerability	2	2
Multithreaded correctness	26	26
Performance	37	37
Security	19	19
Total	373	373

[github-actions]

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