1 files changed, 16 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/BaseProtocolEncoder.java b/src/main/java/org/traccar/BaseProtocolEncoder.java
index d7625e4b8..b6df07b98 100644
--- a/src/main/java/org/traccar/BaseProtocolEncoder.java
+++ b/src/main/java/org/traccar/BaseProtocolEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 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.
@@ -22,25 +22,32 @@ import io.netty.channel.ChannelPromise;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.model.Command;
-import org.traccar.model.Device;
 
 public abstract class BaseProtocolEncoder extends ChannelOutboundHandlerAdapter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BaseProtocolEncoder.class);
 
+    private static final String PROTOCOL_UNKNOWN = "unknown";
+
+    private final Protocol protocol;
+
+    public BaseProtocolEncoder(Protocol protocol) {
+        this.protocol = protocol;
+    }
+
+    public String getProtocolName() {
+        return protocol != null ? protocol.getName() : PROTOCOL_UNKNOWN;
+    }
+
     protected String getUniqueId(long deviceId) {
         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().getById(command.getDeviceId());
-            String password = device.getString(Command.KEY_DEVICE_PASSWORD);
-            if (password != null) {
-                command.set(Command.KEY_DEVICE_PASSWORD, password);
-            } else {
-                command.set(Command.KEY_DEVICE_PASSWORD, defaultPassword);
-            }
+            String password = Context.getIdentityManager()
+                .getDevicePassword(command.getDeviceId(), getProtocolName(), defaultPassword);
+            command.set(Command.KEY_DEVICE_PASSWORD, password);
         }
     }