Do not register default public share provider

Signed-off-by: Louis Chemineau <louis@chmn.me>

Author: artonge

apps/files_sharing/lib/AppInfo/Application.php

@@ -30,7 +30,6 @@
 namespace OCA\Files_Sharing\AppInfo;
 
 use OC\Group\DisplayNameCache as GroupDisplayNameCache;
-use OC\ServerContainer;
 use OC\Share\Share;
 use OC\User\DisplayNameCache;
 use OCA\Files_Sharing\Capabilities;
@@ -52,7 +51,6 @@
 use OCA\Files_Sharing\Notification\Notifier;
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
-use OCA\Files_Sharing\DefaultPublicShareTemplateProvider;
 use OCP\Files\Event\BeforeDirectGetEvent;
 use OCA\Files_Sharing\ShareBackend\File;
 use OCA\Files_Sharing\ShareBackend\Folder;
@@ -113,7 +111,6 @@ function () use ($c) {
 		$context->registerNotifierService(Notifier::class);
 		$context->registerEventListener(UserChangedEvent::class, DisplayNameCache::class);
 		$context->registerEventListener(GroupChangedEvent::class, GroupDisplayNameCache::class);
-		$context->registerPublicShareTemplateProvider(DefaultPublicShareTemplateProvider::class);
 	}
 
 	public function boot(IBootContext $context): void {

lib/private/Share20/PublicShareTemplateFactory.php

@@ -33,7 +33,8 @@
 
 class PublicShareTemplateFactory implements IPublicShareTemplateFactory {
 	public function __construct(
-		private Coordinator $coordinator
+		private Coordinator $coordinator,
+		private DefaultPublicShareTemplateProvider $defaultProvider,
 	) {
 	}
 
@@ -50,12 +51,11 @@ public function getProvider(IShare $share): IPublicShareTemplateProvider {
 
 		$filteredProviders = array_filter(
 			$providers,
-			fn (IPublicShareTemplateProvider $provider) => !($provider instanceof DefaultPublicShareTemplateProvider) && $provider->shouldRespond($share)
+			fn (IPublicShareTemplateProvider $provider) => $provider->shouldRespond($share)
 		);
 
 		if (count($filteredProviders) === 0) {
-			/** @var DefaultPublicShareTemplateProvider */
-			return array_filter($providers, fn (IPublicShareTemplateProvider $provider) => $provider instanceof DefaultPublicShareTemplateProvider)[0];
+			return $this->defaultProvider;
 		} else {
 			return array_shift($filteredProviders);
 		}

lib/public/Share/IPublicShareTemplateFactory.php

@@ -29,6 +29,7 @@
 interface IPublicShareTemplateFactory {
 	/**
 	 * Returns a provider that is willing to respond for given share.
+	 * @since 26.0.0
 	 */
 	public function getProvider(IShare $share): IPublicShareTemplateProvider;
 }

lib/public/Share/IPublicShareTemplateProvider.php

@@ -31,10 +31,12 @@
 interface IPublicShareTemplateProvider {
 	/**
 	 * Returns whether the provider can respond for the given share.
+	 * @since 26.0.0
 	 */
 	public function shouldRespond(IShare $share): bool;
 	/**
 	 * Returns the a template for a given share.
+	 * @since 26.0.0
 	 */
 	public function renderPage(IShare $share, string $token, string $path): TemplateResponse;
 }