From da5d80dc684477ebad43a6211e8d8680c550d715 Mon Sep 17 00:00:00 2001 From: SebastianKrupinski Date: Mon, 11 May 2026 11:21:06 -0400 Subject: [PATCH] fix: remove wrongly used system address book flag Signed-off-by: SebastianKrupinski --- apps/dav/lib/CardDAV/ContactsManager.php | 7 ------- apps/dav/lib/Settings/Admin/SystemAddressBookSettings.php | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/dav/lib/CardDAV/ContactsManager.php b/apps/dav/lib/CardDAV/ContactsManager.php index feca586d94638..bcb3cc746fcee 100644 --- a/apps/dav/lib/CardDAV/ContactsManager.php +++ b/apps/dav/lib/CardDAV/ContactsManager.php @@ -8,8 +8,6 @@ namespace OCA\DAV\CardDAV; -use OCA\DAV\AppInfo\Application; -use OCA\DAV\ConfigLexicon; use OCA\DAV\Db\PropertyMapper; use OCP\Contacts\IManager; use OCP\IAppConfig; @@ -48,11 +46,6 @@ public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlG * @param IURLGenerator $urlGenerator */ public function setupSystemContactsProvider(IManager $cm, ?string $userId, IURLGenerator $urlGenerator) { - $systemAddressBookExposed = $this->appConfig->getValueBool(Application::APP_ID, ConfigLexicon::SYSTEM_ADDRESSBOOK_EXPOSED); - if (!$systemAddressBookExposed) { - return; - } - $addressBooks = $this->backend->getAddressBooksForUser('principals/system/system'); $this->register($cm, $addressBooks, $urlGenerator, $userId); } diff --git a/apps/dav/lib/Settings/Admin/SystemAddressBookSettings.php b/apps/dav/lib/Settings/Admin/SystemAddressBookSettings.php index 9b96314238bae..500bb17e1442c 100644 --- a/apps/dav/lib/Settings/Admin/SystemAddressBookSettings.php +++ b/apps/dav/lib/Settings/Admin/SystemAddressBookSettings.php @@ -28,12 +28,12 @@ public function getSchema(): array { 'section_id' => 'groupware', 'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL, 'title' => $this->l->t('System Address Book'), - 'description' => $this->l->t('The system address book contains contact information for all users in your instance.'), + 'description' => $this->l->t('The system address book contains contact information for all users in your instance. The system address book is required for the searching and auto-completion of users.'), 'fields' => [ [ 'id' => 'system_addressbook_enabled', - 'title' => $this->l->t('Enable System Address Book'), + 'title' => $this->l->t('Enable System Address Book in DAV clients'), 'type' => DeclarativeSettingsTypes::CHECKBOX, 'default' => false, 'options' => [],