[FEATURE REQUEST] Copy/move conflict solved by users

[manuelplazaspalacio]

Related Issues

App: #3959

Library PR (if needed): owncloud/android-library#571

• Added changelog files for the fixed issues in folder changelog/unreleased. More info here

---

QA

Test Plan: https://github.com/owncloud/QA/blob/master/Mobile/Android/Release_4.1/Conflicts%20while%20copy.md

Reports and improvements:

• (1) Dialog wording [FEATURE REQUEST] Copy/move conflict solved by users #4062 (comment) [FIXED]
• (2) Many files with conflicts not solved [FEATURE REQUEST] Copy/move conflict solved by users #4062 (comment) [FIXED]
• (3) [improvement] Add Apply to all option [FEATURE REQUEST] Copy/move conflict solved by users #4062 (comment) [WONT DO HERE]

[JuancaG05]

Good job @manuelplazaspalacio! Some comments here 🚀
Also, don't forget to add your name in the @author tag of every class you modify in their header 😉

[JuancaG05]

Second review round here @manuelplazaspalacio! Check the new comment I added and please, check the comments you didn't reply in the previous review round (the ones that are not resolved yet)

[JuancaG05]

LGTM! Let's move this forward! 🥇 @manuelplazaspalacio

[jesmrec]

(1) [FIXED]

In the conflict dialog, File wording appears even when the item is a folder:

In the screenshot, Documents is a folder.

Is there any way to show folder instead of file depending on the item type?

Pixel2, Android11
80144356d

[jesmrec]

(2) [FIXED]

1. In both root folder and in a folder called A , we have 3 files with same name.
2. Select the 3 files in root
3. Select as target location the folder A -> 3 conflicts must happen
4. Fix every conflict with Keep both

Current: only one item is copied with (1) suffix. In network layer, just one single COPY operation for that file. Additionaly, after fixing the first conflict, an snackbar with a message like Index:1 Size: 1 appears (check video below). Not sure if this is a regression since i did not find in the PR's code.

Expected: all conflicting files solved with Keep both are copied including (1)

Video:

device-2023-06-14-111829.mp4

NOTE: Same behaviour if in step 4. you choose Replace

Pixel2, Android11
80144356d

[jesmrec]

(3) [improvement] [wont do here]

Check this scenario out:

1. Select 500 items (or more) to copy or move
2. Select target folder
3. Hundreds of conflicts happening in the operation.

User must fix all of them one by one. It's usual that in that case all conflicts will be fixed with the same option.

How feasible/posible is adding a checkbox to the dialog called Apply to all or similar, so that if it's checked all conflicts will be fixed using the selected option once clicked? does it make sense to do in a separate issue? what do you think @manuelplazaspalacio @JuancaG05 ?

[jesmrec]

Note for myself: After this is done, we should create another issue to keep same behaviour in uploads. Now, when new item is uploaded and a name conflict happens, file is duplicated with (2) suffix instead of (1).

[jesmrec]

Approved on my side. Great job!