Repository navigation

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

Merged

alperozturk96 merged 29 commits into

masterfrom

fix/internal-104835

Oct 1, 2026

Merged

Fix conflicts for offline uploads when uploading same file again#17590
alperozturk96 merged 29 commits into
masterfrom
fix/internal-104835

Commits on Sep 28, 2026
- fix/internal-104835: do not overwrite existent file metadata
  daniele-verducci
  committed
  b29fd03
- wip
  daniele-verducci
  committed
  8876bc8
- fix/internal-104835: avoid showing conflict window for an unmodified, already uploaded file
  daniele-verducci
  committed
  0f71ab8
- fix/internal-104835: check size as well
  daniele-verducci
  committed
  864a766
- fix/internal-104835: lint
  daniele-verducci
  committed
  cc1585d
- Refactored java function: moved into FileExtensions
  daniele-verducci
  committed
  3476acc
- Removed wrongly-placed file update code from uploadworker and updaging etagOnServer field properly in UploadFileOperation
  daniele-verducci
  committed
  57f120b
- Fixed detekt
  daniele-verducci
  committed
  d72c214
- Working fix proof of concept, to be refactored and not taking account edge cases
  daniele-verducci
  committed
  53ed662
- Working conflict resolution for "keep both" in offline upload, aligned new name to the one used for online
  daniele-verducci
  committed
  1376e16
- Fixed conflict resolution dialog content for offline uploads
  daniele-verducci
  committed
  a52c70c
- Fixed lint
  daniele-verducci
  committed
  be6382c
- Applied suggestions from PR
  daniele-verducci
  committed
  0d32eda
- Applied some proposed fixes from PR
  daniele-verducci
  committed
  384f75c
- Fixes in conflict resolve dialog, see https://github.com/nextcloud/android/pull/17590/changes\#r4034298542
  daniele-verducci
  committed
  1764dc3
- Implemented file conflict name generator specific for offlineOperations
  daniele-verducci
  committed
  be34c4b
- Tests for file conflict name generator specific for offlineOperations
  daniele-verducci
  committed
  e424ba7
- Fix lint
  daniele-verducci
  committed
  0570945
- Fixed bug in duplicate files renaming generator, fixed test
  daniele-verducci
  committed
  537f619
- Lint
  daniele-verducci
  committed
  9699cb1
- Moved regexp outside of recurrency
  daniele-verducci
  committed
  0bbfd15
- Removed unreliable file creation date check
  daniele-verducci
  committed
  195b066
- Tests for OCFile.isTheSameAs() extension
  daniele-verducci
  committed
  9d1d17a
- Fixed lint
  daniele-verducci
  committed
  e3cd497
- de-duplicate tests
  
  alperozturk96
  authored and
  daniele-verducci
  committed
  da40023
- simplify logic, and add upper bound instead recursive loop
  
  alperozturk96
  authored and
  daniele-verducci
  committed
  c15b70c
- Fixed getRemotePathForConflictResolution (broken after refactoring), written relevant test
  daniele-verducci
  committed
  67477e3
- Fixed lint
  daniele-verducci
  committed
  0a63501
- Fix SpotBugs
  daniele-verducci
  committed
  b705c69

Commits

Commits on Sep 28, 2026