diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/org/traccar/model/Command.java | 2 | ||||
-rw-r--r-- | src/org/traccar/protocol/MiniFinderProtocol.java | 3 | ||||
-rw-r--r-- | src/org/traccar/protocol/MiniFinderProtocolEncoder.java | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index 5bde1c652..dd541e643 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -38,5 +38,5 @@ public class Command extends Extensible { public static final String KEY_DEVICE_PASSWORD = "devicePassword"; public static final String KEY_RADIUS = "radius"; - public static final String CUSTOM = "CUSTOM"; + public static final String TYPE_CUSTOM = "CUSTOM"; } diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index a2dbd6c41..b22539277 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -18,7 +18,6 @@ package org.traccar.protocol; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringDecoder; -import org.jboss.netty.handler.codec.string.StringEncoder; import org.traccar.BaseProtocol; import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; @@ -30,7 +29,7 @@ public class MiniFinderProtocol extends BaseProtocol { public MiniFinderProtocol() { super("minifinder"); - setSupportedCommands(Command.CUSTOM); + setSupportedCommands(Command.TYPE_CUSTOM); } @Override diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java index 5d15bc54a..729c57573 100644 --- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java +++ b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java @@ -27,8 +27,8 @@ public class MiniFinderProtocolEncoder extends StringProtocolEncoder { protected Object encodeCommand(Command command) { switch (command.getType()) { - case Command.CUSTOM: - return command.getAttributes().keySet().iterator().next().toString(); + case Command.TYPE_CUSTOM: + return command.getAttributes().get("raw"); default: Log.warning(new UnsupportedOperationException(command.getType())); break; |