AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MailService: Fix references

Browse Source
This commit is contained in:
Jonathan Jenne
2023-10-23 13:05:14 +02:00
parent 6e009b82c4
commit 0f63847d78
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Services.EmailService/EmailService.vb
View File

@@ -1,11 +1,10 @@
Imports System.Timers Imports System.Timers
Imports System.IO Imports System.IO
Imports System.ComponentModel Imports System.ComponentModel
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.Messaging
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.Encryption
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Public Class EmailService Public Class EmailService
@@ -22,7 +21,7 @@ Public Class EmailService
Private _QueueTimer As Timer Private _QueueTimer As Timer
Private _AnyDatabaseInitialized As Boolean = False Private _AnyDatabaseInitialized As Boolean = False
Private _limilab As Limilab Private _limilab As Limilab
Private _MailSender As MailSender Private _MailSender As Mail.MailSender
Private ReadOnly _messageSend As Boolean = False Private ReadOnly _messageSend As Boolean = False
Private Enum DatabaseType Private Enum DatabaseType
@@ -92,7 +91,7 @@ Public Class EmailService
_Logger.Debug("Inititalize Email") _Logger.Debug("Inititalize Email")
_limilab = New Limilab(_LogConfig) _limilab = New Limilab(_LogConfig)
_MailSender = New MailSender(_LogConfig) _MailSender = New Mail.MailSender(_LogConfig)
' === Initialize Queue === ' === Initialize Queue ===
@@ -348,15 +347,15 @@ Public Class EmailService
' ======= Connect to server ======= ' ======= Connect to server =======
Dim oOptions As New MailSender.MailSenderOptions() With { Dim oOptions As New Mail.MailSession.MailSessionOptions() With {
.EnableTls1_1 = _Config.TlsVersion.EnableTls1_1, .EnableTls1_1 = _Config.TlsVersion.EnableTls1_1,
.EnableTls1_2 = _Config.TlsVersion.EnableTls1_2, .EnableTls1_2 = _Config.TlsVersion.EnableTls1_2,
.EnableDefault = _Config.TlsVersion.EnableDefault .EnableDefault = _Config.TlsVersion.EnableDefault
} }
Dim oResult = _MailSender.ConnectToServer(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions) Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions)
If oResult = False Then If oResult.Connected = False Then
_Logger.Warn("Could not connect to server. Skipping.") _Logger.Warn("Could not connect to server. Skipping.")
Continue For Continue For
@@ -487,7 +486,7 @@ Public Class EmailService
Next ' Account Queue Next ' Account Queue
Dim oDisconnected = _MailSender.DisconnectFromServer() Dim oDisconnected = _MailSender.Disconnect()
If oDisconnected = False Then If oDisconnected = False Then
_Logger.Warn("Error while disconnecting from Server. Continuing.") _Logger.Warn("Error while disconnecting from Server. Continuing.")
End If End If