From 646f9a4d274639340fac56bef3c38bf633f530d9 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 20 Jan 2024 14:40:10 -0800 Subject: [PATCH] fixup! New: Option to disable Email encryption --- .../Datastore/Migration/201_email_encryptionFixture.cs | 2 +- src/NzbDrone.Core/Localization/Core/en.json | 2 +- src/NzbDrone.Core/Notifications/Email/EmailSettings.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/201_email_encryptionFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/201_email_encryptionFixture.cs index ed93aa321..7a6cee1ca 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/201_email_encryptionFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/201_email_encryptionFixture.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core.Test.Datastore.Migration items.Should().HaveCount(1); items.First().Implementation.Should().Be("Email"); items.First().ConfigContract.Should().Be("EmailSettings"); - items.First().Settings.UseEncryption.Should().Be((int)EmailEncryptionType.Optimistically); + items.First().Settings.UseEncryption.Should().Be((int)EmailEncryptionType.Preferred); } [Test] diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index cff9c6b71..3a0b392e7 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -1261,7 +1261,7 @@ "NotificationsEmailSettingsServer": "Server", "NotificationsEmailSettingsServerHelpText": "Hostname or IP of Email server", "NotificationsEmailSettingsUseEncryption": "Use Encryption", - "NotificationsEmailSettingsUseEncryptionHelpText": "Whether to optimistically use encryption if configured on the server, to always use encryption via SSL (Port 465 only) or StartTLS (any other port) or to never use encryption", + "NotificationsEmailSettingsUseEncryptionHelpText": "Whether to prefer using encryption if configured on the server, to always use encryption via SSL (Port 465 only) or StartTLS (any other port) or to never use encryption", "NotificationsEmbySettingsSendNotifications": "Send Notifications", "NotificationsEmbySettingsSendNotificationsHelpText": "Have MediaBrowser send notifications to configured providers", "NotificationsEmbySettingsUpdateLibraryHelpText": "Update Library on Import, Rename, or Delete?", diff --git a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs index cdc259c78..f6b23caad 100644 --- a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs +++ b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs @@ -74,7 +74,7 @@ namespace NzbDrone.Core.Notifications.Email public enum EmailEncryptionType { - Optimistically = 0, + Preferred = 0, Always = 1, Never = 2 }