DI

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
DI

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

apps/federatedfilesharing/lib/AppInfo/Application.php

@@ -58,6 +58,7 @@ function() use ($container) {
 					$server->query(AddressHandler::class),
 					$server->getLogger(),
 					$server->getUserManager(),
+					$server->getShareManager(),
 					$server->getCloudIdManager(),
 					$server->getActivityManager(),
 					$server->getNotificationManager(),

apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php

@@ -47,6 +47,7 @@
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Share;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\IManager;
 use OCP\Share\IShare;
 use OCP\Util;
 
@@ -67,6 +68,9 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
 	/** @var IUserManager */
 	private $userManager;
 
+	/** @var IManager */
+	private $shareManager;
+
 	/** @var ICloudIdManager */
 	private $cloudIdManager;
 
@@ -99,6 +103,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
 	 * @param AddressHandler $addressHandler
 	 * @param ILogger $logger
 	 * @param IUserManager $userManager
+	 * @param IManager $shareManager
 	 * @param ICloudIdManager $cloudIdManager
 	 * @param IActivityManager $activityManager
 	 * @param INotificationManager $notificationManager
@@ -113,6 +118,7 @@ public function __construct(IAppManager $appManager,
 								AddressHandler $addressHandler,
 								ILogger $logger,
 								IUserManager $userManager,
+								IManager $shareManager,
 								ICloudIdManager $cloudIdManager,
 								IActivityManager $activityManager,
 								INotificationManager $notificationManager,
@@ -127,6 +133,7 @@ public function __construct(IAppManager $appManager,
 		$this->addressHandler = $addressHandler;
 		$this->logger = $logger;
 		$this->userManager = $userManager;
+		$this->shareManager = $shareManager;
 		$this->cloudIdManager = $cloudIdManager;
 		$this->activityManager = $activityManager;
 		$this->notificationManager = $notificationManager;
@@ -804,10 +811,10 @@ protected function verifyShare(IShare $share, $token) {
 
 		if ($share->getShareType() === IShare::TYPE_CIRCLE) {
 			try {
-				$share = \OC::$server->getShareManager()
-									 ->getShareByToken($token);
-
-				return true;
+				$knownShare = $this->shareManager->getShareByToken($token);
+				if ($knownShare->getId() === $share->getId()) {
+					return true;
+				}
 			} catch (ShareNotFound $e) {
 			}
 		}