aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-03-27 18:52:05 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2019-03-27 18:52:05 -0700
commit1f710ea91b25aec02d04b69e5b9f6dbd96230a82 (patch)
treeb7f036cdf8aaff1697304eaf60dde293093e65af
parentdaacd9e40d6b6528391d796a5a365e661f3b581f (diff)
downloadtrackermap-server-1f710ea91b25aec02d04b69e5b9f6dbd96230a82.tar.gz
trackermap-server-1f710ea91b25aec02d04b69e5b9f6dbd96230a82.tar.bz2
trackermap-server-1f710ea91b25aec02d04b69e5b9f6dbd96230a82.zip
Fix photo decoding
-rw-r--r--src/org/traccar/protocol/FifotrackProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/org/traccar/protocol/FifotrackProtocolDecoder.java
index 5831a75dd..beaa34125 100644
--- a/src/org/traccar/protocol/FifotrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/FifotrackProtocolDecoder.java
@@ -77,7 +77,7 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
.number("d+,") // length
.number("(d+),") // imei
.any()
- .number("(d+),") // length
+ .number(",(d+),") // length
.expression("([^*]+)") // photo id
.text("*")
.number("xx")
@@ -87,7 +87,7 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
.text("$$")
.number("d+,") // length
.number("(d+),") // imei
- .expression("([^*]+)") // photo id
+ .expression("([^*]+),") // photo id
.number("(d+),") // offset
.number("(d+),") // size
.number("(x+)") // data