Skip to content

Commit e5d78e2

Browse files
committed
refactor(files): Remove App class and move files.max_chunk_size to JSConfigHelper
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent b119f15 commit e5d78e2

5 files changed

Lines changed: 5 additions & 45 deletions

File tree

apps/files/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
1717
'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
1818
'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
19-
'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
2019
'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
2120
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
2221
'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',

apps/files/composer/composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class ComposerStaticInitFiles
3131
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
3232
'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
3333
'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
34-
'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
3534
'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
3635
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
3736
'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',

apps/files/lib/App.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

apps/files/lib/AppInfo/Application.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
use OCP\ITagManager;
5353
use OCP\IUserSession;
5454
use OCP\Share\IManager as IShareManager;
55-
use OCP\Util;
5655
use Psr\Container\ContainerInterface;
5756
use Psr\Log\LoggerInterface;
5857

@@ -131,7 +130,6 @@ public function boot(IBootContext $context): void {
131130
$context->injectFn(Closure::fromCallable([$this, 'registerCollaboration']));
132131
$context->injectFn([Listener::class, 'register']);
133132
$this->registerTemplates();
134-
$this->registerHooks();
135133
}
136134

137135
private function registerCollaboration(IProviderManager $providerManager): void {
@@ -144,8 +142,4 @@ private function registerTemplates(): void {
144142
$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
145143
$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
146144
}
147-
148-
private function registerHooks(): void {
149-
Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
150-
}
151145
}

lib/private/Template/JSConfigHelper.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use OC\CapabilitiesManager;
1313
use OC\Files\FilenameValidator;
1414
use OC\Share\Share;
15+
use OCA\Files\Service\ChunkedUploadConfig;
1516
use OCA\Provisioning_API\Controller\AUserDataOCSController;
1617
use OCP\App\AppPathNotFoundException;
1718
use OCP\App\IAppManager;
@@ -246,7 +247,10 @@ public function getConfig(): string {
246247
'defaultRemoteExpireDateEnabled' => $defaultRemoteExpireDateEnabled,
247248
'defaultRemoteExpireDate' => $defaultRemoteExpireDate,
248249
'defaultRemoteExpireDateEnforced' => $defaultRemoteExpireDateEnforced,
249-
]
250+
],
251+
'files' => [
252+
'max_chunk_size' => ChunkedUploadConfig::getMaxChunkSize(),
253+
],
250254
]),
251255
'_theme' => json_encode([
252256
'entity' => $this->defaults->getEntity(),
@@ -277,9 +281,6 @@ public function getConfig(): string {
277281
$this->initialStateService->provideInitialState('core', 'config', $config);
278282
$this->initialStateService->provideInitialState('core', 'capabilities', $capabilities);
279283

280-
// Allow hooks to modify the output values
281-
\OC_Hook::emit('\OCP\Config', 'js', ['array' => &$array]);
282-
283284
$result = '';
284285

285286
// Echo it

0 commit comments

Comments
 (0)