codinux
/
eInvoicing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved date up and added default values

This commit is contained in:
dankito 2024-11-27 04:23:07 +01:00
parent 318903db40
commit 00c062f9a9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
View File

@ -157,10 +157,10 @@ open class EmailsFetcher(
val sender = message.from?.firstOrNull()?.let { map(it) } val sender = message.from?.firstOrNull()?.let { map(it) }
val email = Email( val email = Email(
sender, message.subject ?: "", sender, message.subject ?: "", map(message.sentDate ?: message.receivedDate),
message.getRecipients(Message.RecipientType.TO).map { map(it) }, message.getRecipients(Message.RecipientType.CC).map { map(it) }, message.getRecipients(Message.RecipientType.TO).map { map(it) }, message.getRecipients(Message.RecipientType.CC).map { map(it) },
(message.replyTo.firstOrNull() as? InternetAddress)?.let { if (it.address != sender?.address) map(it) else null }, // only set replyTo if it differs from sender (message.replyTo.firstOrNull() as? InternetAddress)?.let { if (it.address != sender?.address) map(it) else null }, // only set replyTo if it differs from sender
map(message.sentDate ?: message.receivedDate), status.folder.getUID(message), status.folder.getUID(message),
parts.any { it.mediaType == "application/pgp-encrypted" }, parts.any { it.mediaType == "application/pgp-encrypted" },
getPlainTextBody(messageBodyParts, status), getHtmlBody(messageBodyParts, status), getPlainTextBody(messageBodyParts, status), getHtmlBody(messageBodyParts, status),
attachments attachments

10
e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/Email.kt
View File

@ -6,15 +6,15 @@ import java.time.ZoneId
class Email( class Email(
val sender: EmailAddress?, val sender: EmailAddress?,
val subject: String, val subject: String,
val date: Instant,
val to: List<EmailAddress>, val to: List<EmailAddress>,
val cc: List<EmailAddress>, val cc: List<EmailAddress>,
val replayTo: EmailAddress?, val replayTo: EmailAddress? = null,
val date: Instant,
val messageId: Long, val messageId: Long,
val isEncrypted: Boolean = false, val isEncrypted: Boolean = false,
val plainTextBody: String?, val plainTextBody: String? = null,
val htmlBody: String?, val htmlBody: String? = null,
val attachments: List<EmailAttachment> val attachments: List<EmailAttachment> = emptyList()
) { ) {
val plainTextOrHtmlBody: String? by lazy { plainTextBody ?: htmlBody } val plainTextOrHtmlBody: String? by lazy { plainTextBody ?: htmlBody }