From 2c604b9c9ee8f996902acfdd60626324a8414d34 Mon Sep 17 00:00:00 2001 From: Edward Valley Date: Wed, 10 Jul 2019 17:03:25 -0400 Subject: Changes after third review --- src/main/java/org/traccar/database/DeviceManager.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/traccar/database/DeviceManager.java') diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java index de4607d1f..d1a205b01 100644 --- a/src/main/java/org/traccar/database/DeviceManager.java +++ b/src/main/java/org/traccar/database/DeviceManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2018 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. @@ -29,6 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.config.Config; import org.traccar.Context; +import org.traccar.model.Command; import org.traccar.model.Device; import org.traccar.model.DeviceState; import org.traccar.model.DeviceAccumulators; @@ -114,6 +115,21 @@ public class DeviceManager extends BaseObjectManager 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); + if (password != null) { + return password; + } + + return defaultPassword; + } + public Device getDeviceByPhone(String phone) { return devicesByPhone.get(phone); } -- cgit v1.2.3