diff options
author | Edward Valley <ed.valley@yandex.com> | 2019-07-10 18:11:13 -0400 |
---|---|---|
committer | Edward Valley <ed.valley@yandex.com> | 2019-07-10 18:11:13 -0400 |
commit | 0064dec35205fba7b1c8e6c1c0553407688055a8 (patch) | |
tree | 87d117c73daaf3ab3c301262ee3d9d815cc405ad /src/main/java/org/traccar/database | |
parent | 2c604b9c9ee8f996902acfdd60626324a8414d34 (diff) | |
download | trackermap-server-0064dec35205fba7b1c8e6c1c0553407688055a8.tar.gz trackermap-server-0064dec35205fba7b1c8e6c1c0553407688055a8.tar.bz2 trackermap-server-0064dec35205fba7b1c8e6c1c0553407688055a8.zip |
Changes after fourth review
Diffstat (limited to 'src/main/java/org/traccar/database')
-rw-r--r-- | src/main/java/org/traccar/database/DeviceManager.java | 7 | ||||
-rw-r--r-- | src/main/java/org/traccar/database/IdentityManager.java | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java index d1a205b01..231be7b07 100644 --- a/src/main/java/org/traccar/database/DeviceManager.java +++ b/src/main/java/org/traccar/database/DeviceManager.java @@ -115,14 +115,9 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity return devicesByUniqueId.get(uniqueId); } - public String getDevicePassword(long id) { - - return getById(id).getString(Command.KEY_DEVICE_PASSWORD); - } - public String getDevicePassword(long id, String defaultPassword) { - String password = getDevicePassword(id); + String password = getById(id).getString(Command.KEY_DEVICE_PASSWORD); if (password != null) { return password; } diff --git a/src/main/java/org/traccar/database/IdentityManager.java b/src/main/java/org/traccar/database/IdentityManager.java index 331706669..add3e5a79 100644 --- a/src/main/java/org/traccar/database/IdentityManager.java +++ b/src/main/java/org/traccar/database/IdentityManager.java @@ -26,8 +26,6 @@ public interface IdentityManager { Device getByUniqueId(String uniqueId) throws Exception; - String getDevicePassword(long id); - String getDevicePassword(long id, String defaultPassword); Position getLastPosition(long deviceId); |