From 3a293661cd2900c115cfea6037c02d659c57aa52 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 18 Jun 2022 13:19:53 -0700
Subject: Move device status

---
 .../java/org/traccar/handler/events/MotionEventHandler.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/traccar/handler/events/MotionEventHandler.java')

diff --git a/src/main/java/org/traccar/handler/events/MotionEventHandler.java b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
index 724e9bf15..bc9d5f722 100644
--- a/src/main/java/org/traccar/handler/events/MotionEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MotionEventHandler.java
@@ -17,12 +17,12 @@
 package org.traccar.handler.events;
 
 import io.netty.channel.ChannelHandler;
-import org.traccar.database.DeviceManager;
 import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 import org.traccar.reports.common.TripsConfig;
+import org.traccar.session.ConnectionManager;
 import org.traccar.session.DeviceState;
 import org.traccar.session.cache.CacheManager;
 
@@ -34,13 +34,14 @@ import java.util.Map;
 public class MotionEventHandler extends BaseEventHandler {
 
     private final CacheManager cacheManager;
-    private final DeviceManager deviceManager;
+    private final ConnectionManager connectionManager;
     private final TripsConfig tripsConfig;
 
     @Inject
-    public MotionEventHandler(CacheManager cacheManager, DeviceManager deviceManager, TripsConfig tripsConfig) {
+    public MotionEventHandler(
+            CacheManager cacheManager, ConnectionManager connectionManager, TripsConfig tripsConfig) {
         this.cacheManager = cacheManager;
-        this.deviceManager = deviceManager;
+        this.connectionManager = connectionManager;
         this.tripsConfig = tripsConfig;
     }
 
@@ -123,14 +124,14 @@ public class MotionEventHandler extends BaseEventHandler {
         }
 
         Map<Event, Position> result = null;
-        DeviceState deviceState = deviceManager.getDeviceState(deviceId);
+        DeviceState deviceState = connectionManager.getDeviceState(deviceId);
 
         if (deviceState.getMotionState() == null) {
             deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
         } else {
             result = updateMotionState(deviceState, position);
         }
-        deviceManager.setDeviceState(deviceId, deviceState);
+        connectionManager.setDeviceState(deviceId, deviceState);
         return result;
     }
 
-- 
cgit v1.2.3