aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-07-11 10:43:26 +0500
committerAbyss777 <abyss@fox5.ru>2016-07-11 10:43:26 +0500
commitc9a4996cefa55ed8fb4571f440bd81e74fc91167 (patch)
treec34d221c8567b8f180e5c516a8e5385eea8965a9 /src
parent894fc83e1c775e10bd24b42b6b85779fa5fc7cb7 (diff)
downloadtraccar-server-c9a4996cefa55ed8fb4571f440bd81e74fc91167.tar.gz
traccar-server-c9a4996cefa55ed8fb4571f440bd81e74fc91167.tar.bz2
traccar-server-c9a4996cefa55ed8fb4571f440bd81e74fc91167.zip
- "from" sometimes not handled by mail servers
- better handle empty mail user attributes - fix deleting attribute in attribute editor - fix duplicating attribute if name changed
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/notification/NotificationMail.java16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index 443018221..944200f2f 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -87,9 +87,15 @@ public final class NotificationMail {
boolean auth = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.auth"));
result.put("mail.smtp.auth", auth);
- result.put("mail.smtp.username", object.getAttributes().get("mail.smtp.username"));
- result.put("mail.smtp.password", object.getAttributes().get("mail.smtp.password"));
- result.put("mail.smtp.from", object.getAttributes().get("mail.smtp.from"));
+ if (object.getAttributes().containsKey("mail.smtp.username")) {
+ result.put("mail.smtp.username", object.getAttributes().get("mail.smtp.username"));
+ }
+ if (object.getAttributes().containsKey("mail.smtp.password")) {
+ result.put("mail.smtp.password", object.getAttributes().get("mail.smtp.password"));
+ }
+ if (object.getAttributes().containsKey("mail.smtp.from")) {
+ result.put("mail.smtp.from", object.getAttributes().get("mail.smtp.from"));
+ }
}
return result;
}
@@ -115,6 +121,10 @@ public final class NotificationMail {
mailMessage = new MimeMessage(mailSession);
+ if (mailServerProperties.getProperty("mail.smtp.from") != null) {
+ mailMessage.setFrom(new InternetAddress(mailServerProperties.getProperty("mail.smtp.from")));
+ }
+
mailMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(
Context.getDataManager().getUser(userId).getEmail()));
mailMessage.setSubject(NotificationFormatter.formatTitle(userId, event, position));