From e79ab7d0c565425c9d103930787f37c1ed3a9ed6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 9 Sep 2019 14:32:11 +0200 Subject: [PATCH] The share manager knows which provider can accept shares Signed-off-by: Joas Schilling --- apps/files_sharing/lib/Controller/ShareAPIController.php | 5 ----- lib/private/Share20/Manager.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 9c5f6abee6..90a76e2223 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -966,11 +966,6 @@ class ShareAPIController extends OCSController { throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); } - if ($share->getShareType() !== IShare::TYPE_USER && - $share->getShareType() !== IShare::TYPE_GROUP) { - throw new OCSNotFoundException($this->l->t('Share type does not support accepting')); - } - try { $this->shareManager->acceptShare($share, $this->currentUser); } catch (GenericShareException $e) { diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index ba370e7724..298aa6f0f5 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -943,7 +943,7 @@ class Manager implements IManager { if (!method_exists($provider, 'acceptShare')) { // TODO FIX ME - throw new \InvalidArgumentException('not supported'); + throw new \InvalidArgumentException('Share provider does not support accepting'); } $provider->acceptShare($share, $recipientId); $event = new GenericEvent($share);