diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php index d694e650b4871..9cdaaa2bfd6fa 100644 --- a/apps/settings/lib/AppInfo/Application.php +++ b/apps/settings/lib/AppInfo/Application.php @@ -47,7 +47,6 @@ use OCA\Settings\Middleware\SubadminMiddleware; use OCA\Settings\Search\AppSearch; use OCA\Settings\Search\SectionSearch; -use OCA\Settings\Search\UserSearch; use OCA\Settings\SetupChecks\BruteForceThrottler; use OCA\Settings\SetupChecks\CheckUserCertificates; use OCA\Settings\SetupChecks\DefaultPhoneRegionSet; @@ -101,7 +100,6 @@ public function register(IRegistrationContext $context): void { $context->registerMiddleware(SubadminMiddleware::class); $context->registerSearchProvider(SectionSearch::class); $context->registerSearchProvider(AppSearch::class); - $context->registerSearchProvider(UserSearch::class); // Register listeners $context->registerEventListener(AppPasswordCreatedEvent::class, AppPasswordCreatedActivityListener::class); diff --git a/apps/settings/lib/Search/UserSearch.php b/apps/settings/lib/Search/UserSearch.php deleted file mode 100644 index 24dd56c283c57..0000000000000 --- a/apps/settings/lib/Search/UserSearch.php +++ /dev/null @@ -1,77 +0,0 @@ - - * - * @author Stephan Orbaugh - * - * - * @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 . - * - */ -namespace OCA\Settings\Search; - -use OCP\IL10N; -use OCP\IUser; -use OCP\Search\IProvider; -use OCP\Search\ISearchQuery; -use OCP\Search\SearchResult; - -class UserSearch implements IProvider { - - - /** @var IL10N */ - protected $l; - - public function __construct( - IL10N $l) { - $this->l = $l; - } - - /** - * @inheritDoc - */ - public function getId(): string { - return 'users'; - } - - /** - * @inheritDoc - */ - public function getName(): string { - return $this->l->t('Users'); - } - - /** - * @inheritDoc - */ - public function getOrder(string $route, array $routeParameters): int { - return 300; - } - - /** - * @inheritDoc - */ - public function search(IUser $user, ISearchQuery $query): SearchResult { - - return SearchResult::complete( - $this->l->t('Users'), - [] - ); - } -} diff --git a/lib/private/Search/SearchComposer.php b/lib/private/Search/SearchComposer.php index b20d47aa94e78..3f86111d15608 100644 --- a/lib/private/Search/SearchComposer.php +++ b/lib/private/Search/SearchComposer.php @@ -223,12 +223,6 @@ private function fetchIcon(string $appId, string $providerId): string { [$appId, 'app.svg'], ['core', 'places/default-app-icon.svg'], ]; - if ($appId === 'settings' && $providerId === 'users') { - // Conflict: - // the file /apps/settings/users.svg is already used in black version by top right user menu - // Override icon name here - $icons = [['settings', 'users-white.svg']]; - } foreach ($icons as $i => $icon) { try { return $this->urlGenerator->imagePath(... $icon);