diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-02-25 17:55:09 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 17:55:09 +1300 |
| commit | e4aa15f0eb0646d6158fd8386f8f9c5477db6bfe (patch) | |
| tree | 05c597d59b9dde5199721e0076a372cfbceab419 /src/org/traccar/notification/NotificationMail.java | |
| parent | 981ab9d051d0b84cdc256fa48883f2c214e8bc3c (diff) | |
| parent | e8500e8f6c440277d60e0418ab6a82f4bf80b887 (diff) | |
| download | trackermap-server-e4aa15f0eb0646d6158fd8386f8f9c5477db6bfe.tar.gz trackermap-server-e4aa15f0eb0646d6158fd8386f8f9c5477db6bfe.tar.bz2 trackermap-server-e4aa15f0eb0646d6158fd8386f8f9c5477db6bfe.zip | |
Merge pull request #2942 from Abyss777/smpp
Implement SMS notifications with help of smpp protocol
Diffstat (limited to 'src/org/traccar/notification/NotificationMail.java')
| -rw-r--r-- | src/org/traccar/notification/NotificationMail.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java index 7b7ef6e74..41cb2e681 100644 --- a/src/org/traccar/notification/NotificationMail.java +++ b/src/org/traccar/notification/NotificationMail.java @@ -1,5 +1,6 @@ /* - * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,7 +107,7 @@ public final class NotificationMail { } message.addRecipient(Message.RecipientType.TO, new InternetAddress(user.getEmail())); - MailMessage mailMessage = NotificationFormatter.formatMessage(userId, event, position); + MailMessage mailMessage = NotificationFormatter.formatMailMessage(userId, event, position); message.setSubject(mailMessage.getSubject()); message.setContent(mailMessage.getBody(), "text/html; charset=utf-8"); |