aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorGavriel Fleischer <flocsy@gmail.com>2019-02-12 03:45:44 +0200
committerGavriel Fleischer <flocsy@gmail.com>2019-02-12 03:45:44 +0200
commitc1de08db7773eef6b1ed4a6e2b62f15d1df6a2a5 (patch)
tree7690af5fb65cf4c81c1535a9958f688badf886c8 /src/org
parentc37ebc1b07ba7ea6eeccc0b04b2cac72041507e0 (diff)
downloadtraccar-server-c1de08db7773eef6b1ed4a6e2b62f15d1df6a2a5.tar.gz
traccar-server-c1de08db7773eef6b1ed4a6e2b62f15d1df6a2a5.tar.bz2
traccar-server-c1de08db7773eef6b1ed4a6e2b62f15d1df6a2a5.zip
fixed 8bit voice message
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/WatchProtocol.java4
-rw-r--r--src/org/traccar/protocol/WatchProtocolEncoder.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/org/traccar/protocol/WatchProtocol.java
index 5d923106d..07a146572 100644
--- a/src/org/traccar/protocol/WatchProtocol.java
+++ b/src/org/traccar/protocol/WatchProtocol.java
@@ -22,6 +22,8 @@ import org.traccar.model.Command;
import io.netty.handler.codec.string.StringEncoder;
+import java.nio.charset.StandardCharsets;
+
public class WatchProtocol extends BaseProtocol {
public WatchProtocol() {
@@ -45,7 +47,7 @@ public class WatchProtocol extends BaseProtocol {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
pipeline.addLast(new WatchFrameDecoder());
- pipeline.addLast(new StringEncoder());
+ pipeline.addLast(new StringEncoder(StandardCharsets.ISO_8859_1));
pipeline.addLast(new WatchProtocolEncoder());
pipeline.addLast(new WatchProtocolDecoder(WatchProtocol.this));
}
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index 431b0455a..28b0b9407 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -109,7 +109,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin
index += 1;
}
- return new String(encodedData, StandardCharsets.US_ASCII);
+ return new String(encodedData, StandardCharsets.ISO_8859_1);
}
@Override