aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-06-03 10:57:09 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-06-03 10:57:09 +1200
commit9ecabbef669cbd1a91490f4872d4c220b54e37a4 (patch)
tree7d2afe2b865dc5f9f10faa5ce7d213a219afa82a /src/org/traccar/database
parent06a746b44dae69b0c84a5302f92a1bcbe2dc827f (diff)
parent0271fa29703f24df24756c117209b9b04e127fc3 (diff)
downloadtrackermap-server-9ecabbef669cbd1a91490f4872d4c220b54e37a4.tar.gz
trackermap-server-9ecabbef669cbd1a91490f4872d4c220b54e37a4.tar.bz2
trackermap-server-9ecabbef669cbd1a91490f4872d4c220b54e37a4.zip
Merge pull request #1992 from Abyss777/master
Show events in web interface with toasts
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r--src/org/traccar/database/ConnectionManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index 9e0da8485..ec5903548 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -94,7 +94,7 @@ public class ConnectionManager {
if (status.equals(Device.STATUS_ONLINE)) {
event.setType(Event.TYPE_DEVICE_ONLINE);
}
- updateEvent(event);
+ updateEvent(event, null);
}
device.setStatus(status);
@@ -147,7 +147,7 @@ public class ConnectionManager {
}
}
- public synchronized void updateEvent(Event event) {
+ public synchronized void updateEvent(Event event, Position position) {
long deviceId = event.getDeviceId();
try {
Context.getDataManager().addEvent(event);
@@ -157,7 +157,7 @@ public class ConnectionManager {
for (long userId : Context.getPermissionsManager().getDeviceUsers(deviceId)) {
if (listeners.containsKey(userId)) {
for (UpdateListener listener : listeners.get(userId)) {
- listener.onUpdateEvent(event);
+ listener.onUpdateEvent(event, position);
}
}
}
@@ -183,7 +183,7 @@ public class ConnectionManager {
public interface UpdateListener {
void onUpdateDevice(Device device);
void onUpdatePosition(Position position);
- void onUpdateEvent(Event event);
+ void onUpdateEvent(Event event, Position position);
}
public synchronized void addListener(long userId, UpdateListener listener) {