refactor(files): Remove App class and move files.max_chunk_size to JSConfigHelper

Signed-off-by: provokateurin <kate@provokateurin.de>

apps/files/composer/composer/autoload_classmap.php

@@ -16,7 +16,6 @@ return array(
     'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
     'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
     'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
     'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
     'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',

apps/files/composer/composer/autoload_static.php

@@ -31,7 +31,6 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
         'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
         'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
         'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
         'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',

apps/files/lib/App.php

@@ -1,56 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OCA\Files;
-
-use OC\NavigationManager;
-use OCA\Files\Service\ChunkedUploadConfig;
-use OCP\App\IAppManager;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IConfig;
-use OCP\IGroupManager;
-use OCP\INavigationManager;
-use OCP\IURLGenerator;
-use OCP\IUserSession;
-use OCP\L10N\IFactory;
-use OCP\Server;
-use Psr\Log\LoggerInterface;
-
-class App {
-	private static ?INavigationManager $navigationManager = null;
-
-	/**
-	 * Returns the app's navigation manager
-	 */
-	public static function getNavigationManager(): INavigationManager {
-		// TODO: move this into a service in the Application class
-		if (self::$navigationManager === null) {
-			self::$navigationManager = new NavigationManager(
-				Server::get(IAppManager::class),
-				Server::get(IUrlGenerator::class),
-				Server::get(IFactory::class),
-				Server::get(IUserSession::class),
-				Server::get(IGroupManager::class),
-				Server::get(IConfig::class),
-				Server::get(LoggerInterface::class),
-				Server::get(IEventDispatcher::class),
-			);
-			self::$navigationManager->clear(false);
-		}
-		return self::$navigationManager;
-	}
-
-	public static function extendJsConfig($settings): void {
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
-
-		$appConfig['files'] = [
-			'max_chunk_size' => ChunkedUploadConfig::getMaxChunkSize(),
-		];
-
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
-	}
-}

apps/files/lib/AppInfo/Application.php

@@ -52,7 +52,6 @@ use OCP\IServerContainer;
 use OCP\ITagManager;
 use OCP\IUserSession;
 use OCP\Share\IManager as IShareManager;
-use OCP\Util;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -131,7 +130,6 @@ class Application extends App implements IBootstrap {
 		$context->injectFn(Closure::fromCallable([$this, 'registerCollaboration']));
 		$context->injectFn([Listener::class, 'register']);
 		$this->registerTemplates();
-		$this->registerHooks();
 	}
 
 	private function registerCollaboration(IProviderManager $providerManager): void {
@@ -144,8 +142,4 @@ class Application extends App implements IBootstrap {
 		$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
 		$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 	}
-
-	private function registerHooks(): void {
-		Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
-	}
 }

lib/private/Template/JSConfigHelper.php

@@ -12,6 +12,7 @@ use OC\Authentication\Token\IProvider;
 use OC\CapabilitiesManager;
 use OC\Files\FilenameValidator;
 use OC\Share\Share;
+use OCA\Files\Service\ChunkedUploadConfig;
 use OCA\Provisioning_API\Controller\AUserDataOCSController;
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
@@ -246,7 +247,10 @@ class JSConfigHelper {
 					'defaultRemoteExpireDateEnabled' => $defaultRemoteExpireDateEnabled,
 					'defaultRemoteExpireDate' => $defaultRemoteExpireDate,
 					'defaultRemoteExpireDateEnforced' => $defaultRemoteExpireDateEnforced,
-				]
+				],
+				'files' => [
+					'max_chunk_size' => ChunkedUploadConfig::getMaxChunkSize(),
+				],
 			]),
 			'_theme' => json_encode([
 				'entity' => $this->defaults->getEntity(),
@@ -277,9 +281,6 @@ class JSConfigHelper {
 		$this->initialStateService->provideInitialState('core', 'config', $config);
 		$this->initialStateService->provideInitialState('core', 'capabilities', $capabilities);
 
-		// Allow hooks to modify the output values
-		\OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]);
-
 		$result = '';
 
 		// Echo it