Remove global share accepter since auto-accepting is the default

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/files_sharing/composer/composer/autoload_classmap.php b/apps/files_sharing/composer/composer/autoload_classmap.php
index 7259ca80d163bd563d8d11dd4e18d3f7a6b31941..8f77798bb86f74ef06a2e2ccfe331a1e1402c113 100644 (file)
--- a/apps/files_sharing/composer/composer/autoload_classmap.php
+++ b/apps/files_sharing/composer/composer/autoload_classmap.php
@@ -48,7 +48,6 @@ return array(
     'OCA\\Files_Sharing\\Helper' => $baseDir . '/../lib/Helper.php',
     'OCA\\Files_Sharing\\Hooks' => $baseDir . '/../lib/Hooks.php',
     'OCA\\Files_Sharing\\ISharedStorage' => $baseDir . '/../lib/ISharedStorage.php',
-    'OCA\\Files_Sharing\\Listener\\GlobalShareAcceptanceListener' => $baseDir . '/../lib/Listener/GlobalShareAcceptanceListener.php',
     'OCA\\Files_Sharing\\Listener\\LoadAdditionalListener' => $baseDir . '/../lib/Listener/LoadAdditionalListener.php',
     'OCA\\Files_Sharing\\Listener\\LoadSidebarListener' => $baseDir . '/../lib/Listener/LoadSidebarListener.php',
     'OCA\\Files_Sharing\\Listener\\UserShareAcceptanceListener' => $baseDir . '/../lib/Listener/UserShareAcceptanceListener.php',

diff --git a/apps/files_sharing/composer/composer/autoload_static.php b/apps/files_sharing/composer/composer/autoload_static.php
index 5894f5d43db06d1b9bfd05fdd28e22c08dc0028e..85eb5232bda931ff5d8f4727320e0ecb8bb1bc7a 100644 (file)
--- a/apps/files_sharing/composer/composer/autoload_static.php
+++ b/apps/files_sharing/composer/composer/autoload_static.php
@@ -63,7 +63,6 @@ class ComposerStaticInitFiles_Sharing
         'OCA\\Files_Sharing\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
         'OCA\\Files_Sharing\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
         'OCA\\Files_Sharing\\ISharedStorage' => __DIR__ . '/..' . '/../lib/ISharedStorage.php',
-        'OCA\\Files_Sharing\\Listener\\GlobalShareAcceptanceListener' => __DIR__ . '/..' . '/../lib/Listener/GlobalShareAcceptanceListener.php',
         'OCA\\Files_Sharing\\Listener\\LoadAdditionalListener' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalListener.php',
         'OCA\\Files_Sharing\\Listener\\LoadSidebarListener' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarListener.php',
         'OCA\\Files_Sharing\\Listener\\UserShareAcceptanceListener' => __DIR__ . '/..' . '/../lib/Listener/UserShareAcceptanceListener.php',

diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index af80b85f2245d3f0cc9a946bee32f5fff6da4389..d8019cba240755a8a6d2eb6f3aa2938586c80403 100644 (file)
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -214,7 +214,6 @@ class Application extends App {
                $dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function() {
                        \OCP\Util::addScript('files_sharing', 'dist/collaboration');
                });
-               $dispatcher->addServiceListener(ShareCreatedEvent::class, GlobalShareAcceptanceListener::class);
                $dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
 
                // notifications api to accept incoming user shares

diff --git a/apps/files_sharing/lib/Listener/GlobalShareAcceptanceListener.php b/apps/files_sharing/lib/Listener/GlobalShareAcceptanceListener.php
deleted file mode 100644 (file)
index a536646..0000000
--- a/apps/files_sharing/lib/Listener/GlobalShareAcceptanceListener.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Files_Sharing\Listener;
-
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\IConfig;
-use OCP\Share\Events\ShareCreatedEvent;
-use OCP\Share\IManager;
-use OCP\Share\IShare;
-
-class GlobalShareAcceptanceListener implements IEventListener {
-
-       /** @var IConfig */
-       private $config;
-       /** @var IManager */
-       private $shareManager;
-
-       public function __construct(IConfig $config, IManager $shareManager) {
-               $this->config = $config;
-               $this->shareManager = $shareManager;
-       }
-
-       public function handle(Event $event): void {
-               if (!($event instanceof ShareCreatedEvent)) {
-                       return;
-               }
-
-               if ($this->config->getSystemValueBool('sharing.interal_shares_accepted', false)) {
-                       $share = $event->getShare();
-
-                       if ($share->getShareType() === IShare::TYPE_USER || $share->getShareType() === IShare::TYPE_GROUP) {
-                               $share->setStatus(IShare::STATUS_ACCEPTED);
-                               $this->shareManager->updateShare($share);
-                       }
-               }
-       }
-
-}