aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-19 15:07:51 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-19 15:07:51 +0500
commit285f6feea43be782edc6233b709d47b146250361 (patch)
treeaa9595eb48f5ab0141c4f5ff9d9e60bd11cbe04e /src/org/traccar
parent9519b653a8cef055366b0903fdd371c8f86d1206 (diff)
downloadtraccar-server-285f6feea43be782edc6233b709d47b146250361.tar.gz
traccar-server-285f6feea43be782edc6233b709d47b146250361.tar.bz2
traccar-server-285f6feea43be782edc6233b709d47b146250361.zip
Rename sent flags
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/database/NotificationManager.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index a6ca0ea66..73041a23f 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -62,26 +62,26 @@ public class NotificationManager extends ExtendedObjectManager<Notification> {
for (long userId : users) {
if (event.getGeofenceId() == 0 || Context.getGeofenceManager() != null
&& Context.getGeofenceManager().checkItemPermission(userId, event.getGeofenceId())) {
- boolean webSent = false;
- boolean mailSent = false;
- boolean smsSent = Context.getSmppManager() == null;
+ boolean sentWeb = false;
+ boolean sentMail = false;
+ boolean sentSms = Context.getSmppManager() == null;
for (long notificationId : getEffectiveNotifications(userId, deviceId)) {
Notification notification = getById(notificationId);
if (getById(notificationId).getType().equals(event.getType())) {
- if (!webSent && notification.getWeb()) {
+ if (!sentWeb && notification.getWeb()) {
Context.getConnectionManager().updateEvent(userId, event);
- webSent = true;
+ sentWeb = true;
}
- if (!mailSent && notification.getMail()) {
+ if (!sentMail && notification.getMail()) {
NotificationMail.sendMailAsync(userId, event, position);
- mailSent = true;
+ sentMail = true;
}
- if (!smsSent && notification.getSms()) {
+ if (!sentSms && notification.getSms()) {
NotificationSms.sendSmsAsync(userId, event, position);
- smsSent = true;
+ sentSms = true;
}
}
- if (webSent && mailSent && smsSent) {
+ if (sentWeb && sentMail && sentSms) {
break;
}
}