From 8c024c3ad3cb302866bbfd6d0fccd2b875303693 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 24 Jan 2024 11:06:42 +0000 Subject: [PATCH 1/4] Added condition space in CopyFileUseCase --- .../owncloud/android/domain/files/usecases/CopyFileUseCase.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt index ceaf2a5a97e..94cf53c1261 100644 --- a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt +++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt @@ -49,7 +49,7 @@ class CopyFileUseCase( fun validateOrThrowException(listOfFilesToCopy: List, targetFolder: OCFile) { require(listOfFilesToCopy.isNotEmpty()) - if (listOfFilesToCopy.any { targetFolder.remotePath.startsWith(it.remotePath) }) { + if (listOfFilesToCopy.any { targetFolder.remotePath.startsWith(it.remotePath) and (targetFolder.spaceId == it.spaceId) }) { throw CopyIntoDescendantException() } } From d81ae8e16a2f98c0da8c0b9cbfddb96264fcd350 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 25 Jan 2024 11:02:01 +0000 Subject: [PATCH 2/4] Fix from cr --- .../owncloud/android/domain/files/usecases/CopyFileUseCase.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt index 94cf53c1261..db69cf74eac 100644 --- a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt +++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/CopyFileUseCase.kt @@ -49,7 +49,7 @@ class CopyFileUseCase( fun validateOrThrowException(listOfFilesToCopy: List, targetFolder: OCFile) { require(listOfFilesToCopy.isNotEmpty()) - if (listOfFilesToCopy.any { targetFolder.remotePath.startsWith(it.remotePath) and (targetFolder.spaceId == it.spaceId) }) { + if (listOfFilesToCopy.any { targetFolder.remotePath.startsWith(it.remotePath) && targetFolder.spaceId == it.spaceId }) { throw CopyIntoDescendantException() } } From 4decb6ba1863e15dab68f00832f9ebc10b19ae6b Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 25 Jan 2024 11:15:21 +0000 Subject: [PATCH 3/4] added calens --- changelog/unreleased/4295 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/unreleased/4295 diff --git a/changelog/unreleased/4295 b/changelog/unreleased/4295 new file mode 100644 index 00000000000..faa1db7e745 --- /dev/null +++ b/changelog/unreleased/4295 @@ -0,0 +1,6 @@ +Bugfix: Copy folder into descendant in different spaces + +Copying a folder into another folder with the same name in a different space now works correctly. + +https://github.com/owncloud/android/issues/4293 +https://github.com/owncloud/android/pull/4295 From 03a93f4767b93d52e3d02de9bd9979c5583021aa Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 25 Jan 2024 11:24:38 +0000 Subject: [PATCH 4/4] Calens changelog updated --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6475e7e28af..f303b998955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ ownCloud admins and users. * Bugfix - Conflict in copy with files without extension: [#4222](https://github.com/owncloud/android/issues/4222) * Bugfix - Add "scope" parameter to /token endpoint HTTP requests: [#4260](https://github.com/owncloud/android/pull/4260) * Bugfix - Fix in the handling of the base URL: [#4279](https://github.com/owncloud/android/issues/4279) +* Bugfix - Copy folder into descendant in different spaces: [#4293](https://github.com/owncloud/android/issues/4293) * Change - Android library as a module instead of submodule: [#3962](https://github.com/owncloud/android/issues/3962) * Enhancement - Koin DSL: [#3966](https://github.com/owncloud/android/pull/3966) * Enhancement - Unit tests for datasources classes - Part 1 & Fixes: [#4063](https://github.com/owncloud/android/issues/4063) @@ -122,6 +123,14 @@ ownCloud admins and users. https://github.com/owncloud/android/issues/4279 https://github.com/owncloud/android/pull/4287 +* Bugfix - Copy folder into descendant in different spaces: [#4293](https://github.com/owncloud/android/issues/4293) + + Copying a folder into another folder with the same name in a different space now + works correctly. + + https://github.com/owncloud/android/issues/4293 + https://github.com/owncloud/android/pull/4295 + * Change - Android library as a module instead of submodule: [#3962](https://github.com/owncloud/android/issues/3962) Android library, containing all networking stuff, is now the 5th module in the