[fineract] 01/01: Better fix for SMTP Server Port (FINERACT-1070)

[vorburger]

This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch FINERACT-1070_take-two
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit d189fe838518f4fd3265ec60b04a0289a94d791a
Author: Michael Vorburger <m...@vorburger.ch>
AuthorDate: Fri Dec 11 23:37:05 2020 +0100

    Better fix for SMTP Server Port (FINERACT-1070)
---
 .../core/service/GmailBackedPlatformEmailService.java              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
index 2448734..321fa74 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
@@ -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());