bugfix: HTML email did not resolve inline resources (e.g images) correctly.

Author: lorenzo

releases.json

@@ -2,7 +2,7 @@
   {
     "version": "1.0.4",
     "date": "//TODO",
-    "release-notes": "<ul><li>bugfix: SMTP session builder did not work correctly for SSL connections.</li></ul>"
+    "release-notes": "<ul><li>bugfix: SMTP session builder did not work correctly for SSL connections.</li><li>bugfix: HTML email did not resolve inline images correctly.</li></ul>"
   },
   {
     "version": "1.0.2",

src/main/java/com/reedelk/mail/internal/smtp/type/MailWithHtml.java

@@ -6,9 +6,15 @@
 import com.reedelk.runtime.api.message.Message;
 import com.reedelk.runtime.api.message.content.MimeType;
 import com.reedelk.runtime.api.message.content.Pair;
+import org.apache.commons.mail.DataSourceResolver;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.ImageHtmlEmail;
 
+import javax.activation.DataSource;
+import javax.activation.URLDataSource;
+import java.io.IOException;
+import java.net.URL;
+
 public class MailWithHtml extends AbstractMailType {
 
     public MailWithHtml(SMTPMailSend component, ConverterService converterService) {
@@ -27,7 +33,22 @@ public MailTypeStrategyResult create(FlowContext context, Message message) throw
         Pair<String, String> charsetAndBody = buildCharsetAndMailBody(context, message);
         email.setCharset(charsetAndBody.left());
         email.setHtmlMsg(charsetAndBody.right());
+        email.setDataSourceResolver(new AbsoluteURLDataSourceResolver()); // resolve image sources inline.
 
         return MailTypeStrategyResult.create(email, charsetAndBody.right(), MimeType.TEXT_HTML);
     }
+
+    // Resolves img src URLs when Email contains image URLs
+    private static class AbsoluteURLDataSourceResolver implements DataSourceResolver {
+
+        @Override
+        public DataSource resolve(String resourceLocation) throws IOException {
+            return new URLDataSource(new URL(resourceLocation));
+        }
+
+        @Override
+        public DataSource resolve(String resourceLocation, boolean isLenient) throws IOException {
+            return new URLDataSource(new URL(resourceLocation));
+        }
+    }
 }