fixup! Transfer shares of the transferred root node

Author: juliusknorr

apps/files/lib/Service/OwnershipTransferService.php

@@ -158,6 +158,7 @@ public function transfer(IUser $sourceUser,
 		$shares = $this->collectUsersShares(
 			$sourceUid,
 			$output,
+			$view,
 			$sourcePath
 		);
 
@@ -246,6 +247,7 @@ function (FileInfo $fileInfo) use ($progress) {
 
 	private function collectUsersShares(string $sourceUid,
 										OutputInterface $output,
+										View $view,
 										?string $path = null): array {
 		$output->writeln("Collecting all share information for files and folders of $sourceUid ...");
 
@@ -260,10 +262,17 @@ private function collectUsersShares(string $sourceUid,
 					break;
 				}
 				if ($path !== null) {
-					$sharePage = array_filter($sharePage, function (IShare $share) use ($path) {
+					$sharePage = array_filter($sharePage, function (IShare $share) use ($view, $path) {
 						try {
-							$node = $share->getNode();
-							return \OC\Files\Filesystem::normalizePath($path) === $node->getPath();
+							$relativePath = $view->getPath($share->getNodeId());
+							$singleFileTranfer = $view->is_file($path);
+							if ($singleFileTranfer) {
+								return $relativePath === $path;
+							}
+
+							return mb_strpos(
+								Filesystem::normalizePath($relativePath . '/', false),
+								Filesystem::normalizePath($path . '/', false)) === 0;
 						} catch (\Exception $e) {
 							return false;
 						}