diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-13 16:23:59 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-07-14 16:34:43 +0200 |
| commit | 7e281a07bb66a082a35cbdd52f7d1e418beb4f53 (patch) | |
| tree | 9a2ab162c879eec9ede9087d2869a490c3988a49 /apps/settings/lib | |
| parent | 2c87ce60a04eb98533d430ef7abe386ef0d04c2a (diff) | |
| download | nextcloud-server-7e281a07bb66a082a35cbdd52f7d1e418beb4f53.tar.gz nextcloud-server-7e281a07bb66a082a35cbdd52f7d1e418beb4f53.zip | |
Use IBootstrap for the app federatedfilesharing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/settings/lib')
| -rw-r--r-- | apps/settings/lib/Controller/UsersController.php | 4 | ||||
| -rw-r--r-- | apps/settings/lib/Settings/Personal/PersonalInfo.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index eab6c087d86..b6e43fcae85 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -36,6 +36,7 @@ use OC\AppFramework\Http; use OC\Encryption\Exceptions\ModuleDoesNotExistsException; use OC\ForbiddenException; use OC\Security\IdentityProof\Manager; +use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\Settings\BackgroundJobs\VerifyUserData; use OCA\User_LDAP\User_Proxy; use OCP\App\IAppManager; @@ -362,8 +363,7 @@ class UsersController extends Controller { $data[AccountManager::PROPERTY_EMAIL] = ['value' => $email, 'scope' => $emailScope]; } if ($this->appManager->isEnabledForUser('federatedfilesharing')) { - $federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application(); - $shareProvider = $federatedFileSharing->getFederatedShareProvider(); + $shareProvider = \OC::$server->query(FederatedShareProvider::class); if ($shareProvider->isLookupServerUploadEnabled()) { $data[AccountManager::PROPERTY_WEBSITE] = ['value' => $website, 'scope' => $websiteScope]; $data[AccountManager::PROPERTY_ADDRESS] = ['value' => $address, 'scope' => $addressScope]; diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php index 152259b743f..c4b505c4248 100644 --- a/apps/settings/lib/Settings/Personal/PersonalInfo.php +++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php @@ -32,7 +32,7 @@ namespace OCA\Settings\Settings\Personal; use OC\Accounts\AccountManager; -use OCA\FederatedFileSharing\AppInfo\Application; +use OCA\FederatedFileSharing\FederatedShareProvider; use OCP\App\IAppManager; use OCP\AppFramework\Http\TemplateResponse; use OCP\Files\FileInfo; @@ -96,8 +96,8 @@ class PersonalInfo implements ISettings { $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing'); $lookupServerUploadEnabled = false; if ($federatedFileSharingEnabled) { - $federatedFileSharing = \OC::$server->query(Application::class); - $shareProvider = $federatedFileSharing->getFederatedShareProvider(); + /** @var FederatedShareProvider $shareProvider */ + $shareProvider = \OC::$server->query(FederatedShareProvider::class); $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled(); } |