From 96d8ea7322d1a588dd2d4cfac73d5c049ebe3faf Mon Sep 17 00:00:00 2001 From: Edward Valley Date: Wed, 17 Jul 2019 11:58:45 -0400 Subject: Make device password group configurable --- src/main/java/org/traccar/database/DeviceManager.java | 11 +++++++++-- src/main/java/org/traccar/database/IdentityManager.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/traccar/database') diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java index d5b1c8c0d..51f35b3db 100644 --- a/src/main/java/org/traccar/database/DeviceManager.java +++ b/src/main/java/org/traccar/database/DeviceManager.java @@ -116,13 +116,20 @@ public class DeviceManager extends BaseObjectManager implements Identity } @Override - public String getDevicePassword(long id, String defaultPassword) { + public String getDevicePassword(long id, String protocol, String defaultPassword) { - String password = getById(id).getString(Command.KEY_DEVICE_PASSWORD); + String password = lookupAttributeString(id, Command.KEY_DEVICE_PASSWORD, null, false); if (password != null) { return password; } + if (protocol != null) { + password = Context.getConfig().getString(protocol + "." + Command.KEY_DEVICE_PASSWORD); + if (password != null) { + return password; + } + } + return defaultPassword; } diff --git a/src/main/java/org/traccar/database/IdentityManager.java b/src/main/java/org/traccar/database/IdentityManager.java index b30537f4f..af6a6ce71 100644 --- a/src/main/java/org/traccar/database/IdentityManager.java +++ b/src/main/java/org/traccar/database/IdentityManager.java @@ -26,7 +26,7 @@ public interface IdentityManager { Device getByUniqueId(String uniqueId) throws Exception; - String getDevicePassword(long id, String defaultPassword); + String getDevicePassword(long id, String protocol, String defaultPassword); Position getLastPosition(long deviceId); -- cgit v1.2.3