fix: implement changes related to IMountProviderArg

Signed-off-by: Salvatore Martire <[email protected]>

Author: salmart-dev

apps/files_sharing/lib/External/MountProvider.php

@@ -75,25 +75,22 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 
 	public function getMountsFromMountPoints(
 		string $path,
-		array $mountsInfo,
-		array $mountsMetadata,
+		array $mountProviderArgs,
 		IStorageFactory $loader,
 	): array {
 		if (empty($mountsInfo)) {
 			return [];
 		}
 
 		$uniqueMountOwnerIds = [];
-		$uniqueRootIds = [];
 		$user = null;
-		foreach ($mountsInfo as $mountInfo) {
+		foreach ($mountProviderArgs as $mountProviderArg) {
+			$mountInfo = $mountProviderArg->mountInfo;
 			// get a list of unique owner IDs root mount IDs
 			$user ??= $mountInfo->getUser();
 			$uniqueMountOwnerIds[$user->getUID()] ??= true;
-			$uniqueRootIds[$mountInfo->getRootId()] ??= true;
 		}
 		$uniqueMountOwnerIds = array_keys($uniqueMountOwnerIds);
-		$uniqueRootIds = array_keys($uniqueRootIds);
 
 		// make sure the MPs belong to the same user
 		if (count($uniqueMountOwnerIds) !== 1) {
@@ -104,8 +101,9 @@ public function getMountsFromMountPoints(
 		$mountOwnerId = $user->getUID();
 		$pathPrefix = "/$mountOwnerId/files";
 		$pathHashes = [];
-		foreach ($mountsInfo as $mountInfo) {
-			$mountPoint = rtrim($mountInfo->getMountPoint(), '/');
+		foreach ($mountProviderArgs as $mountProviderArg) {
+			$mountPoint =
+				rtrim($mountProviderArg->mountInfo->getMountPoint(), '/');
 			if (str_starts_with($mountPoint, $pathPrefix)) {
 				$pathHashes[] = md5(substr($mountPoint, strlen($pathPrefix)));
 			}

apps/files_sharing/lib/MountProvider.php

@@ -283,8 +283,7 @@ public function adjustTarget(
 	 */
 	public function getMountsFromMountPoints(
 		string $path,
-		array $mountsInfo,
-		array $mountsMetadata,
+		array $mountProviderArgs,
 		IStorageFactory $loader,
 	): array {
 		/**
@@ -295,7 +294,8 @@ public function getMountsFromMountPoints(
 		$uniqueMountOwnerIds = [];
 		$uniqueRootIds = [];
 		$user = null;
-		foreach ($mountsInfo as $mountInfo) {
+		foreach ($mountProviderArgs as $mountProviderArg) {
+			$mountInfo = $mountProviderArg->mountInfo;
 			// get a list of unique owner IDs root mount IDs
 			$user ??= $mountInfo->getUser();
 			$uniqueMountOwnerIds[$user->getUID()] ??= true;