Return the paths for the users without setting them all up

Signed-off-by: Joas Schilling <coding@schilljs.com>

3 files changed, 9 insertions, 10 deletions

diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php
index 26c3f2b42e6..1cbb27cb618 100644
--- a/lib/public/Share/IManager.php
+++ b/lib/public/Share/IManager.php
@@ -207,9 +207,10 @@ interface IManager {
 	 *
 	 * Then the access list will to '/folder1/folder2/fileA' is:
 	 * [
-	 *  users => ['user1', 'user2', 'user4'],
+	 *  users  => ['user1' => ['node_id' => 42, 'node_path' => '/path'], 'user2' => [...]],
+	 *  remote => ['user1' => ['node_id' => 42, 'node_path' => '/path'], 'user2' => [...]],
 	 *  public => bool
-	 *  remote => bool
+	 *  mail => bool
 	 * ]
 	 *
 	 * This is required for encryption/activity
diff --git a/lib/public/Share/IShareHelper.php b/lib/public/Share/IShareHelper.php
index 5e99f86832d..01202cf477b 100644
--- a/lib/public/Share/IShareHelper.php
+++ b/lib/public/Share/IShareHelper.php
@@ -33,12 +33,9 @@ use OCP\Files\Node;
 interface IShareHelper {
 
 	/**
-	 * If a user has access to a file
-	 *
 	 * @param Node $node
-	 * @param array $users Array of userIds
-	 * @return array Mapping $uid to an array of nodes
+	 * @return array [ users => [Mapping $uid => $path], remotes => [Mapping $cloudId => $path]]
 	 * @since 12
 	 */
-	public function getPathsForAccessList(Node $node, $users);
+	public function getPathsForAccessList(Node $node);
 }
diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php
index 2533e81abf2..fba432f31e7 100644
--- a/lib/public/Share/IShareProvider.php
+++ b/lib/public/Share/IShareProvider.php
@@ -196,14 +196,15 @@ interface IShareProvider {
 	 * Return will look like:
 	 *
 	 * [
-	 *  users => ['user1', 'user2', 'user4'],
+	 *  users  => ['user1' => ['node_id' => 42, 'node_path' => '/path'], 'user2' => [...]],
+	 *  remote => ['user1' => ['node_id' => 42, 'node_path' => '/path'], 'user2' => [...]],
+	 *  mail   => bool
 	 *  public => bool
-	 *  remote => bool
 	 * ]
 	 *
 	 * @param Node[] $nodes The list of nodes to get access for
 	 * @param bool $currentAccess If current access is required (like for removed shares that might get revived later)
-	 * @return string[]
+	 * @return array
 	 * @since 12
 	 */
 	public function getAccessList($nodes, $currentAccess);