Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[New Arch] Conflicts management #3005

Closed
14 tasks done
abelgardep opened this issue Oct 26, 2020 · 1 comment · Fixed by #3762
Closed
14 tasks done

[New Arch] Conflicts management #3005

abelgardep opened this issue Oct 26, 2020 · 1 comment · Fixed by #3762
Assignees
@abelgardep @JuancaG05
Labels
Estimation - 3 (M) New architecture
Milestone
3.0 - Synchroniza...

Comments

@abelgardep
Copy link
Contributor

abelgardep commented Oct 26, 2020 •
edited by JuancaG05

Synchronization epic: #2818

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

TASKS

  • Research (if needed)
  • Create branch new_arch/conflicts_management
  • Development tasks
    • Single item shows a red icon to show conflict
    • Kotlinize ConflictsResolveActivity.java
    • Kotlinize ConflictsResolveDialog.java
    • Remove old ConflictsResolveActivity.java and ConflictsResolveDialog.java
    • Show conflict dialog from the main file list
    • Show conflict dialog from the file details view
    • Folder shows a red icon if any descendants have conflicts [ADVANCED -> [New arch] Advanced conflicts management #3766]
  • Code review and apply changes requested
  • Design test plan
  • QA
  • Merge branch new_arch/conflicts_management into new_arch/synchronization
@abelgardep abelgardep added this to the Synchronization milestone milestone Oct 26, 2020
@abelgardep abelgardep mentioned this issue May 19, 2021
Closed
75 tasks
@jesmrec jesmrec mentioned this issue Aug 20, 2021
Closed
9 tasks
@jesmrec jesmrec mentioned this issue Jan 19, 2022
Merged
1 task
@abelgardep abelgardep mentioned this issue Jun 2, 2022
Closed
20 tasks
@abelgardep abelgardep self-assigned this Sep 2, 2022
@jesmrec
Copy link
Collaborator

jesmrec commented Sep 2, 2022

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)

@abelgardep abelgardep assigned JuancaG05 and unassigned abelgardep Sep 19, 2022
@JuancaG05 JuancaG05 mentioned this issue Sep 19, 2022
Merged
1 task
@JuancaG05 JuancaG05 linked a pull request Sep 19, 2022 that will close this issue
[New Arch] Basic conflicts management #3762
Merged
1 task
@JuancaG05 JuancaG05 removed a link to a pull request Sep 19, 2022
[New Arch] Basic conflicts management #3762
Merged
1 task
@JuancaG05 JuancaG05 linked a pull request Sep 19, 2022 that will close this issue
[New Arch] Basic conflicts management #3762
Merged
1 task
@JuancaG05 JuancaG05 mentioned this issue Sep 30, 2022
Merged
2 tasks
@jesmrec jesmrec removed the Sprint label Mar 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@abelgardep abelgardep

@JuancaG05 JuancaG05

Labels
Estimation - 3 (M) New architecture
Projects
None yet
Milestone
3.0 - Synchronization milestone
Development

Successfully merging a pull request may close this issue.

[New Arch] Basic conflicts management owncloud/android
3 participants
@jesmrec @abelgardep @JuancaG05