From f7d58f2a13b23b36d861faa95e66a96fb4bd1dbb Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 3 Aug 2016 10:33:01 +0500
Subject: - Optimized SSL connection

- Added "mail.smtp.ssl.trust" parameter
---
 debug.xml                                          |  2 ++
 src/org/traccar/notification/NotificationMail.java | 19 +++++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debug.xml b/debug.xml
index abd230748..70bd0e80f 100644
--- a/debug.xml
+++ b/debug.xml
@@ -63,6 +63,8 @@
     for SSL
     <entry key='mail.smtp.port'>465</entry>
     <entry key='mail.smtp.ssl.enable'>true</entry>
+    for self-signed server sertificates
+    <entry key='mail.smtp.ssl.trust'>smtp.example.com</entry>
 
     <entry key='mail.smtp.from'>traccar@example.com</entry>
 
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index 944200f2f..bc7f6d4da 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -48,14 +48,11 @@ public final class NotificationMail {
             result.put("mail.smtp.port", config.getString("mail.smtp.port", "25"));
 
             if (config.getBoolean("mail.smtp.starttls.enable")) {
-                result.put("mail.smtp.starttls.enable",
-                        config.getBoolean("mail.smtp.starttls.enable"));
+                result.put("mail.smtp.starttls.enable", config.getBoolean("mail.smtp.starttls.enable"));
             } else if (config.getBoolean("mail.smtp.ssl.enable")) {
-                result.put("mail.smtp.socketFactory.port",
-                        result.getProperty("mail.smtp.port"));
-                result.put("mail.smtp.socketFactory.class",
-                        "javax.net.ssl.SSLSocketFactory");
+                result.put("mail.smtp.ssl.enable", config.getBoolean("mail.smtp.ssl.enable"));
             }
+            result.put("mail.smtp.ssl.trust", config.getBoolean("mail.smtp.ssl.trust"));
 
             result.put("mail.smtp.auth", config.getBoolean("mail.smtp.auth"));
             result.put("mail.smtp.user", config.getString("mail.smtp.username", null));
@@ -77,12 +74,10 @@ public final class NotificationMail {
                 result.put("mail.smtp.starttls.enable", tls);
             } else if (object.getAttributes().containsKey("mail.smtp.ssl.enable")) {
                 boolean ssl = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.ssl.enable"));
-                if (ssl) {
-                    result.put("mail.smtp.socketFactory.port",
-                            result.getProperty("mail.smtp.port"));
-                    result.put("mail.smtp.socketFactory.class",
-                            "javax.net.ssl.SSLSocketFactory");
-                }
+                result.put("mail.smtp.ssl.enable", ssl);
+            }
+            if (object.getAttributes().containsKey("mail.smtp.ssl.trust")) {
+                result.put("mail.smtp.ssl.trust", object.getAttributes().get("mail.smtp.ssl.trust"));
             }
             boolean auth = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.auth"));
             result.put("mail.smtp.auth", auth);
-- 
cgit v1.2.3


From 2498caf8e965c25e4c177a8a075f37b8937c8be3 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 3 Aug 2016 12:31:57 +0500
Subject: Fix mail session creating

---
 src/org/traccar/notification/NotificationMail.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index bc7f6d4da..a0b80d2ab 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -112,7 +112,7 @@ public final class NotificationMail {
                     return;
                 }
             }
-            mailSession = Session.getDefaultInstance(mailServerProperties, null);
+            mailSession = Session.getInstance(mailServerProperties, null);
 
             mailMessage = new MimeMessage(mailSession);
 
-- 
cgit v1.2.3