Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup! New: Option to disable Email encryption 

Closes #6380
This commit is contained in:
Mark McDowall 2024-01-19 21:35:57 -08:00
parent a9c3792d42
commit ae1e972849
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core.Test/Datastore/Migration/201_email_encryptionFixture.cs
View File

@ -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.Auto);
items.First().Settings.UseEncryption.Should().Be((int)EmailEncryptionType.Optimistically);
}
[Test]

2
src/NzbDrone.Core/Localization/Core/en.json
View File

@ -1261,7 +1261,7 @@
"NotificationsEmailSettingsServer": "Server",
"NotificationsEmailSettingsServerHelpText": "Hostname or IP of Email server",
"NotificationsEmailSettingsUseEncryption": "Use Encryption",
"NotificationsEmailSettingsUseEncryptionHelpText": "Whether to automatically detect encyption support, to always encryption via SSL (Port 465 only) or StartTLS (any other port) or to never 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",
"NotificationsEmbySettingsSendNotifications": "Send Notifications",
"NotificationsEmbySettingsSendNotificationsHelpText": "Have MediaBrowser send notifications to configured providers",
"NotificationsEmbySettingsUpdateLibraryHelpText": "Update Library on Import, Rename, or Delete?",

4
src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
View File

@ -45,7 +45,7 @@ namespace NzbDrone.Core.Notifications.Email
[FieldDefinition(1, Label = "Port")]
public int Port { get; set; }
[FieldDefinition(2, Label = "NotificationsEmailSettingsRequireEncryption", HelpText = "NotificationsEmailSettingsRequireEncryptionHelpText", Type = FieldType.Select, SelectOptions = typeof(EmailEncryptionType))]
[FieldDefinition(2, Label = "NotificationsEmailSettingsUseEncryption", HelpText = "NotificationsEmailSettingsUseEncryptionHelpText", Type = FieldType.Select, SelectOptions = typeof(EmailEncryptionType))]
public int UseEncryption { get; set; }
[FieldDefinition(3, Label = "Username", Privacy = PrivacyLevel.UserName)]
@ -74,7 +74,7 @@ namespace NzbDrone.Core.Notifications.Email
public enum EmailEncryptionType
{
Auto = 0,
Optimistically = 0,
Always = 1,
Never = 2
}