Fix conflicts for offline uploads when uploading same file again - #17590

Open

daniele-verducci wants to merge 12 commits into

fix/internal-104835

Commits on Sep 10, 2026

fix/internal-104835: do not overwrite existent file metadata
daniele-verducci
committed
0797c8f
wip
daniele-verducci
committed
0fce6f0
fix/internal-104835: avoid showing conflict window for an unmodified, already uploaded file
daniele-verducci
committed
e34a825
fix/internal-104835: check size as well
daniele-verducci
committed
4acbe4e
fix/internal-104835: lint
daniele-verducci
committed
7b1188d
Refactored java function: moved into FileExtensions
daniele-verducci
committed
a7a8684
Removed wrongly-placed file update code from uploadworker and updaging etagOnServer field properly in UploadFileOperation
daniele-verducci
committed
c27ef93
Fixed detekt
daniele-verducci
committed
1c3ea1c
Working fix proof of concept, to be refactored and not taking account edge cases
daniele-verducci
committed
d342ff8
Working conflict resolution for "keep both" in offline upload, aligned new name to the one used for online
daniele-verducci
committed
0ee6020
Fixed conflict resolution dialog content for offline uploads
daniele-verducci
committed
971ae9a
Fixed lint
daniele-verducci
committed
57df3dd