diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-02-10 08:24:14 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 08:24:14 +1300 |
| commit | e1bd30161e842b61e395e932ec9251a326025ad8 (patch) | |
| tree | fc142d1f296623186e55ef0cd51df4219fa8dbc1 /src/org/traccar/notification | |
| parent | 96e45b5a990182ddc4b878e48d93d301d014427a (diff) | |
| parent | 267c6e1651b6e0e91dd7c3463f86de929d7bc73c (diff) | |
| download | trackermap-server-e1bd30161e842b61e395e932ec9251a326025ad8.tar.gz trackermap-server-e1bd30161e842b61e395e932ec9251a326025ad8.tar.bz2 trackermap-server-e1bd30161e842b61e395e932ec9251a326025ad8.zip | |
Merge pull request #3765 from Abyss777/device_timezone
Unified Device timezone handling
Diffstat (limited to 'src/org/traccar/notification')
| -rw-r--r-- | src/org/traccar/notification/EventForwarder.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java index d1bdd4aba..8be4c23b0 100644 --- a/src/org/traccar/notification/EventForwarder.java +++ b/src/org/traccar/notification/EventForwarder.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 2018 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. @@ -85,11 +85,9 @@ public abstract class EventForwarder { if (position != null) { data.put(KEY_POSITION, position); } - if (event.getDeviceId() != 0) { - Device device = Context.getIdentityManager().getById(event.getDeviceId()); - if (device != null) { - data.put(KEY_DEVICE, device); - } + Device device = Context.getIdentityManager().getById(event.getDeviceId()); + if (device != null) { + data.put(KEY_DEVICE, device); } if (event.getGeofenceId() != 0) { Geofence geofence = Context.getGeofenceManager().getById(event.getGeofenceId()); |