Merge pull request #1541 from apache/FINERACT-1070_take-two

Better fix for SMTP Server Port (FINERACT-1070)
This commit is contained in:
Manthan Surkar
2020-12-13 03:43:16 +05:30
committed by GitHub
@@ -68,11 +68,10 @@ public class GmailBackedPlatformEmailService implements PlatformEmailService {
try {
if (smtpCredentialsData.isUseTLS()) {
email.getMailSession().getProperties().put("mail.smtp.starttls.enable", "true");
email.setSslSmtpPort(smtpCredentialsData.getPort());
} else {
email.setSmtpPort(Integer.parseInt(smtpCredentialsData.getPort()));
// FINERACT-1070: NOT email.setSSLOnConnect(true); email.setSslSmtpPort(smtpCredentialsData.getPort());
email.setStartTLSRequired(true);
}
email.setSmtpPort(Integer.parseInt(smtpCredentialsData.getPort()));
email.setFrom(smtpCredentialsData.getFromEmail(), smtpCredentialsData.getFromName());
email.setSubject(emailDetails.getSubject());