diff options
author | Iván Ávalos <avalos@disroot.org> | 2021-12-27 20:48:47 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2021-12-27 20:48:47 -0600 |
commit | aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f (patch) | |
tree | e74474e6b6bd75a71ac79bdbd31b9237a7b3c2d6 /src/main/java/org/traccar/handler/events/GeofenceEventHandler.java | |
parent | f03b999d6d17e53c1c1e1aa2f9271d03f12f2264 (diff) | |
download | traccar-server-aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f.tar.gz traccar-server-aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f.tar.bz2 traccar-server-aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f.zip |
Revert "Merge branch 'master' into suntech-fixes"
This reverts commit f03b999d6d17e53c1c1e1aa2f9271d03f12f2264, reversing
changes made to 3a528ddc88f72f39ff9566cf5e0f54938b1584ef.
Diffstat (limited to 'src/main/java/org/traccar/handler/events/GeofenceEventHandler.java')
-rw-r--r-- | src/main/java/org/traccar/handler/events/GeofenceEventHandler.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java b/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java index dae0c891f..f4807e56b 100644 --- a/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java +++ b/src/main/java/org/traccar/handler/events/GeofenceEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 2019 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import java.util.Map; import io.netty.channel.ChannelHandler; import org.traccar.database.CalendarManager; -import org.traccar.database.ConnectionManager; import org.traccar.database.GeofenceManager; import org.traccar.database.IdentityManager; import org.traccar.model.Calendar; @@ -36,15 +35,12 @@ public class GeofenceEventHandler extends BaseEventHandler { private final IdentityManager identityManager; private final GeofenceManager geofenceManager; private final CalendarManager calendarManager; - private final ConnectionManager connectionManager; public GeofenceEventHandler( - IdentityManager identityManager, GeofenceManager geofenceManager, CalendarManager calendarManager, - ConnectionManager connectionManager) { + IdentityManager identityManager, GeofenceManager geofenceManager, CalendarManager calendarManager) { this.identityManager = identityManager; this.geofenceManager = geofenceManager; this.calendarManager = calendarManager; - this.connectionManager = connectionManager; } @Override @@ -67,9 +63,6 @@ public class GeofenceEventHandler extends BaseEventHandler { oldGeofences.removeAll(currentGeofences); device.setGeofenceIds(currentGeofences); - if (!oldGeofences.isEmpty() || !newGeofences.isEmpty()) { - connectionManager.updateDevice(device); - } Map<Event, Position> events = new HashMap<>(); for (long geofenceId : oldGeofences) { |