android icon indicating copy to clipboard operation
android copied to clipboard

[New Arch] Conflicts management

Open abelgardep opened this issue 5 years ago • 1 comments

Synchronization epic: #2818

Handle conflicts between local and remote files. Currently handled by SynchronizeFileOperation and SynchronizeFolderOperation.

TASKS

  • [x] Research (if needed)
  • [x] Create branch new_arch/conflicts_management
  • [ ] Development tasks
    • [x] Single item shows a red icon to show conflict
    • [x] Kotlinize ConflictsResolveActivity.java
    • [x] Kotlinize ConflictsResolveDialog.java
    • [x] Remove old ConflictsResolveActivity.java and ConflictsResolveDialog.java
    • [x] Show conflict dialog from the main file list
    • [x] Show conflict dialog from the file details view
    • [ ] Folder shows a red icon if any descendants have conflicts (to recheck)
  • [ ] Code review and apply changes requested
  • [ ] Design test plan
  • [ ] QA
  • [ ] Merge branch new_arch/conflicts_management into new_arch/synchronization

abelgardep avatar Oct 26 '20 08:10 abelgardep

One clarification. In master version, when a conflict happens a notification is raised up. By clicking on it, conflict solving dialog is open in the app. Conflict could also happen in the background (new version of av. offline that collides with new version in server side)

jesmrec avatar Sep 02 '22 12:09 jesmrec