fixup! fixup! feat: mail provider settings

Signed-off-by: SebastianKrupinski <[email protected]>
nextcloud · Oct 21, 2024 · f922723 · f922723
1 parent 426ce82
commit f922723
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -267,10 +267,9 @@ public function schedule(Message $iTipMessage) {
 		$mailService = null;
 
 		try {
-			if ($this->config->getValueInt('core', 'mail_providers_disabled', 0) === 0) {
+			if ($this->config->getValueBool('core', 'mail_providers_enabled', true)) {
 				// retrieve user object
 				$user = $this->userSession->getUser();
-				// evaluate if user object exist
 				if ($user !== null) {
 					// retrieve appropriate service with the same address as sender
 					$mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);

diff --git a/apps/settings/lib/Listener/SystemMailSettingsListener.php b/apps/settings/lib/Listener/SystemMailSettingsListener.php
@@ -43,21 +43,17 @@ public function handle(Event $event): void {
 
 	private function handleGetValue(DeclarativeSettingsGetValueEvent $event): void {
 
-		$event->setValue(
-			match($event->getFieldId()) {
-				'mail_providers_disabled' => $this->config->getValueInt('core', 'mail_providers_disabled', 0),
-			}
-		);
+		if ($event->getFieldId() === 'mail_providers_enabled') {
+			$event->setValue((int)$this->config->getValueBool('core', 'mail_providers_enabled', true));
+		}
 
 	}
 
 	private function handleSetValue(DeclarativeSettingsSetValueEvent $event): void {
 
-		switch ($event->getFieldId()) {
-			case 'mail_providers_disabled':
-				$this->config->setValueInt('core', 'mail_providers_disabled', (int)$event->getValue());
-				$event->stopPropagation();
-				break;
+		if ($event->getFieldId() === 'mail_providers_enabled') {
+			$this->config->setValueBool('core', 'mail_providers_enabled', (bool)$event->getValue());
+			$event->stopPropagation();
 		}
 
 	}

diff --git a/apps/settings/lib/Settings/Admin/SystemMail.php b/apps/settings/lib/Settings/Admin/SystemMail.php
@@ -30,18 +30,18 @@ public function getSchema(): array {
 
 			'fields' => [
 				[
-					'id' => 'mail_providers_disabled',
+					'id' => 'mail_providers_enabled',
 					'title' => $this->l->t('Send system e-mails using'),
 					'type' => DeclarativeSettingsTypes::RADIO,
-					'default' => 0,
+					'default' => 1,
 					'options' => [
 						[
 							'name' => $this->l->t('People\'s e-mail account'),
-							'value' => 0
+							'value' => 1
 						],
 						[
 							'name' => $this->l->t('System e-mail account'),
-							'value' => 1
+							'value' => 0
 						],
 					],
 				],