Moved S/MIME signing / encryption of the actual MimeMessage to the Me…

…ssageProducer class, where things like DKIM signing was already being done
bbottema · May 26, 2019 · 471f713 · 471f713
1 parent 5bfeba3
commit 471f713
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.../src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageProducer.java b/.../src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageProducer.java
@@ -1,6 +1,7 @@
 package org.simplejavamail.converter.internal.mimemessage;
 
 import org.simplejavamail.api.email.Email;
+import org.simplejavamail.internal.modules.ModuleLoader;
 
 import javax.annotation.Nonnull;
 import javax.mail.MessagingException;
@@ -43,7 +44,7 @@ final MimeMessage populateMimeMessage(@Nonnull final Email email, @Nonnull Sessi
 		checkArgumentNotEmpty(email, "email is missing");
 		checkArgumentNotEmpty(session, "session is needed, it cannot be attached later");
 
-		final MimeMessage message = new MimeMessage(session) {
+		MimeMessage message = new MimeMessage(session) {
 			@Override
 			protected void updateMessageID() throws MessagingException {
 				if (valueNullOrEmpty(email.getId())) {
@@ -75,9 +76,13 @@ public String toString() {
 		message.setSentDate(new Date());
 
 		if (!valueNullOrEmpty(email.getDkimSigningDomain())) {
-			return signMessageWithDKIM(message, email);
+			message = signMessageWithDKIM(message, email);
 		}
-
+
+		if (ModuleLoader.smimeModuleAvailable()) {
+			message = ModuleLoader.loadSmimeModule().signAndOrEncryptEmail(session, message, email);
+		}
+
 		return message;
 	}
 

diff --git a/...ain/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageProducerHelper.java b/...ain/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageProducerHelper.java
@@ -38,10 +38,7 @@ private MimeMessageProducerHelper() {
 	public static MimeMessage produceMimeMessage(@Nonnull Email email, @Nonnull Session session) throws UnsupportedEncodingException, MessagingException {
 		for (MimeMessageProducer mimeMessageProducer : mimeMessageProducers) {
 			if (mimeMessageProducer.compatibleWithEmail(email)) {
-				final MimeMessage mimeMessage = mimeMessageProducer.populateMimeMessage(email, session);
-				return ModuleLoader.smimeModuleAvailable()
-						? ModuleLoader.loadSmimeModule().signAndOrEncryptEmail(session, mimeMessage, email)
-						: mimeMessage;
+				return mimeMessageProducer.populateMimeMessage(email, session);
 			}
 		}
 		throw new AssertionError("no compatible MimeMessageProducer found for email");