Fix IShareProvider initialization for DAV

lib/private/Share20/ProviderFactory.php

@@ -70,6 +70,8 @@ class ProviderFactory implements IProviderFactory {
 	private $circlesAreNotAvailable = false;
 	/** @var \OCA\Talk\Share\RoomShareProvider */
 	private $roomShareProvider = null;
+	/** @var \OCA\VO_Federation\FederatedGroupShareProvider */
+	private $federatedGroupShareProvider = null;
 
 	private $registeredShareProviders = [];
 
@@ -267,6 +269,31 @@ protected function getRoomShareProvider() {
 		return $this->roomShareProvider;
 	}
 
+	/**
+	 * Create the federated group share provider
+	 *
+	 * @return FederatedGroupShareProvider
+	 */
+	protected function getFederatedGroupShareProvider() {
+		if ($this->federatedGroupShareProvider === null) {
+			/*
+			 * Check if the app is enabled
+			 */
+			$appManager = $this->serverContainer->getAppManager();
+			if (!$appManager->isEnabledForUser('vo_federation')) {
+				return null;
+			}
+
+			try {
+				$this->federatedGroupShareProvider = $this->serverContainer->query('\OCA\VO_Federation\FederatedGroupShareProvider');
+			} catch (\OCP\AppFramework\QueryException $e) {
+				return null;
+			}
+		}
+
+		return $this->federatedGroupShareProvider;
+	}	
+
 	/**
 	 * @inheritdoc
 	 */
@@ -286,6 +313,8 @@ public function getProvider($id) {
 			$provider = $this->getShareByCircleProvider();
 		} elseif ($id === 'ocRoomShare') {
 			$provider = $this->getRoomShareProvider();
+		} elseif ($id === 'ocFederatedGroupShare') {
+			$provider = $this->getFederatedGroupShareProvider();
 		}
 
 		foreach ($this->registeredShareProviders as $shareProvider) {
@@ -327,7 +356,7 @@ public function getProviderForType($shareType) {
 		} elseif ($shareType === IShare::TYPE_DECK) {
 			$provider = $this->getProvider('deck');
 		} elseif ($shareType === IShare::TYPE_FEDERATED_GROUP) {
-			$provider = $this->getProvider('federated_group');
+			$provider = $this->getFederatedGroupShareProvider();
 		}
 
 
@@ -352,6 +381,10 @@ public function getAllProviders() {
 		if ($roomShare !== null) {
 			$shares[] = $roomShare;
 		}
+		$federatedGroupShare = $this->getFederatedGroupShareProvider();
+		if ($federatedGroupShare !== null) {
+			$shares[] = $federatedGroupShare;
+		}		
 
 		foreach ($this->registeredShareProviders as $shareProvider) {
 			/** @var IShareProvider $instance */