summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/appinfo
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-02-25 20:46:01 +0100
committerLukas Reschke <lukas@owncloud.com>2016-02-26 09:26:55 +0100
commit59028cced0a4f7377de9c22012c7624440b14a56 (patch)
treedc209a35e1626309032640459bec268323e51bac /apps/files_sharing/appinfo
parentcb41b1a86397579d55e0ce96e67b80a83037d1d2 (diff)
downloadnextcloud-server-59028cced0a4f7377de9c22012c7624440b14a56.tar.gz
nextcloud-server-59028cced0a4f7377de9c22012c7624440b14a56.zip
Add autodiscovery support to server-to-server sharing
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
Diffstat (limited to 'apps/files_sharing/appinfo')
-rw-r--r--apps/files_sharing/appinfo/application.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index e4a2262fece..64c7517456d 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -24,6 +24,7 @@
namespace OCA\Files_Sharing\AppInfo;
+use OCA\FederatedFileSharing\DiscoveryManager;
use OCA\Files_Sharing\MountProvider;
use OCP\AppFramework\App;
use OC\AppFramework\Utility\SimpleContainer;
@@ -76,12 +77,17 @@ class Application extends App {
$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
$user = $server->getUserSession()->getUser();
$uid = $user ? $user->getUID() : null;
+ $discoveryManager = new DiscoveryManager(
+ \OC::$server->getMemCacheFactory(),
+ \OC::$server->getHTTPClientService()
+ );
return new \OCA\Files_Sharing\External\Manager(
$server->getDatabaseConnection(),
\OC\Files\Filesystem::getMountManager(),
\OC\Files\Filesystem::getLoader(),
$server->getHTTPHelper(),
$server->getNotificationManager(),
+ $discoveryManager,
$uid
);
});