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 9, 2026

fix/internal-104835: do not overwrite existent file metadata

daniele-verducci
authored and
alperozturk96
committed
0dc358c
wip

daniele-verducci
authored and
alperozturk96
committed
071af17
fix/internal-104835: avoid showing conflict window for an unmodified, already uploaded file

daniele-verducci
authored and
alperozturk96
committed
e19a8df
fix/internal-104835: check size as well

daniele-verducci
authored and
alperozturk96
committed
d6c8e6c
fix/internal-104835: lint

daniele-verducci
authored and
alperozturk96
committed
71f12dc
Refactored java function: moved into FileExtensions

daniele-verducci
authored and
alperozturk96
committed
e764786
Removed wrongly-placed file update code from uploadworker and updaging etagOnServer field properly in UploadFileOperation

daniele-verducci
authored and
alperozturk96
committed
e6fa192
Fixed detekt

daniele-verducci
authored and
alperozturk96
committed
ea79580
Working fix proof of concept, to be refactored and not taking account edge cases
daniele-verducci
committed
46530d8
Working conflict resolution for "keep both" in offline upload, aligned new name to the one used for online
daniele-verducci
committed
0a8bf8a
Fixed conflict resolution dialog content for offline uploads
daniele-verducci
committed
2c80bea
Fixed lint
daniele-verducci
committed
804d2fd