From bf296b4af4714a3fe62cd6f9fcff8ac29fcd0178 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 2 Jun 2016 11:54:13 +0500
Subject: Send position with event to websocket

---
 src/org/traccar/database/ConnectionManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/database/ConnectionManager.java')

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) {
-- 
cgit v1.2.3