aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavriel Fleischer <flocsy@gmail.com>2019-01-29 23:36:01 +0200
committerGavriel Fleischer <flocsy@gmail.com>2019-01-29 23:36:01 +0200
commit5bf343a179e9565f78903ae63a002522373163a8 (patch)
tree1f5b67db53f726ad82fb0725d72bd8f780e8bf74
parentff0572b84c85f2bcfb177d1fe7a119a6dc51627a (diff)
downloadtrackermap-server-5bf343a179e9565f78903ae63a002522373163a8.tar.gz
trackermap-server-5bf343a179e9565f78903ae63a002522373163a8.tar.bz2
trackermap-server-5bf343a179e9565f78903ae63a002522373163a8.zip
fixed message encoding
-rw-r--r--src/org/traccar/protocol/WatchProtocolEncoder.java2
-rw-r--r--test/org/traccar/protocol/WatchProtocolEncoderTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index f66ba4072..12067f354 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -37,7 +37,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin
DecimalFormat fmt = new DecimalFormat("+#.##;-#.##", DecimalFormatSymbols.getInstance(Locale.US));
return fmt.format(offset);
} else if (key.equals(Command.KEY_MESSAGE)) {
- return DataConverter.printHex(value.toString().getBytes());
+ return DataConverter.printHex(value.toString().getBytes(StandardCharsets.UTF_16));
}
return null;
diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
index e088a2b04..520d4998c 100644
--- a/test/org/traccar/protocol/WatchProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
@@ -43,7 +43,7 @@ public class WatchProtocolEncoderTest extends ProtocolTest {
command.setDeviceId(1);
command.setType(Command.TYPE_MESSAGE);
command.set(Command.KEY_MESSAGE, "text");
- assertEquals("[CS*123456789012345*0010*MESSAGE,74657874]", encoder.encodeCommand(null, command));
+ assertEquals("[CS*123456789012345*001c*MESSAGE,feff0074006500780074]", encoder.encodeCommand(null, command));
command = new Command();
command.setDeviceId(1);