diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-27 17:00:45 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 17:00:45 +1200 |
| commit | 495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598 (patch) | |
| tree | 4b65fbe2d6081f31762a0d8aa790b9fcf81e81f7 /src/org/traccar/BaseProtocolEncoder.java | |
| parent | 194263a9dc8040ebcbf62c80733aca5097eb3e36 (diff) | |
| parent | 49fa4893269b1732806f7176c279742291e02edf (diff) | |
| download | traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.gz traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.tar.bz2 traccar-server-495b2aa2d2b17bd1a5803ea0bd7dcc64bc81c598.zip | |
Merge pull request #3391 from Abyss777/refactor_drivers_groups
Split Drivers and Groups management
Diffstat (limited to 'src/org/traccar/BaseProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/BaseProtocolEncoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/BaseProtocolEncoder.java b/src/org/traccar/BaseProtocolEncoder.java index 3c2d08471..2c8a81868 100644 --- a/src/org/traccar/BaseProtocolEncoder.java +++ b/src/org/traccar/BaseProtocolEncoder.java @@ -25,12 +25,12 @@ import org.traccar.model.Device; public abstract class BaseProtocolEncoder extends OneToOneEncoder { protected String getUniqueId(long deviceId) { - return Context.getIdentityManager().getDeviceById(deviceId).getUniqueId(); + return Context.getIdentityManager().getById(deviceId).getUniqueId(); } protected void initDevicePassword(Command command, String defaultPassword) { if (!command.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) { - Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId()); + Device device = Context.getIdentityManager().getById(command.getDeviceId()); String password = device.getString(Command.KEY_DEVICE_PASSWORD); if (password != null) { command.set(Command.KEY_DEVICE_PASSWORD, password); |