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.

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

[FEATURE REQUEST] Copy/move conflict solved by users #3935

Closed
13 tasks done
jesmrec opened this issue Feb 24, 2023 · 0 comments · Fixed by #4062 or owncloud/android-library#571
Closed
13 tasks done

[FEATURE REQUEST] Copy/move conflict solved by users #3935

jesmrec opened this issue Feb 24, 2023 · 0 comments · Fixed by #4062 or owncloud/android-library#571

Comments

@jesmrec
Copy link
Collaborator

jesmrec commented Feb 24, 2023

Related with #3946

Current behaviour:

Copy/Move a item to a target folder that contains another item with the same name -> (2) is automatically added to the file name to fix the collision

New behaviour (implemented in the oCIS web):

Showing this kind of dialog:

Screenshot 2023-02-24 at 09 52 14

Skip -> cancel operation
Replace -> that's it, put the new one over the existing one
Keep both -> current behaviour

This behaviour does not depend on the kind of backend (oCIS/oC10)

Conflict solving dialog could be reused for this

TASKS

  • Research (if needed)
  • Create branch feature/file_conflict_solving
  • Development tasks
    • Look for the code that checks whether the file exists or not
    • Instead of directly renaming it, return this information to the fragment
    • Create a new dialog to let the user choose the way to solve the conflict
    • Implement "Skip" option
    • Implement "Replace" option
    • Implement "Keep both" option
  • Code review and apply changes requested
  • Design test plan
  • QA
  • Merge branch feature/file_conflict_solving into master
@JuancaG05 JuancaG05 added this to the 4.0 - Current milestone Mar 6, 2023
@jesmrec jesmrec modified the milestones: 4.0 - Current, 4.1 - Next Apr 13, 2023
@michaelstingl michaelstingl added the p3-medium Normal priority label Apr 13, 2023
@JuancaG05 JuancaG05 changed the title Copy/move conflict solved by users [FEATURE REQUEST] Copy/move conflict solved by users May 2, 2023
manuelplazaspalacio added a commit that referenced this issue Jun 7, 2023
@manuelplazaspalacio manuelplazaspalacio linked a pull request Jun 7, 2023 that will close this issue
4 tasks
manuelplazaspalacio added a commit that referenced this issue Jun 13, 2023
manuelplazaspalacio added a commit that referenced this issue Jun 15, 2023
manuelplazaspalacio added a commit that referenced this issue Jun 22, 2023
@JuancaG05 JuancaG05 removed the Sprint label Jun 23, 2023
jesmrec pushed a commit that referenced this issue Sep 5, 2023
JuancaG05 pushed a commit that referenced this issue Oct 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment