aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-11-10 14:37:08 -0800
committerGitHub <noreply@github.com>2019-11-10 14:37:08 -0800
commit9889611b00b6159fddbdddc236448884886fe2ef (patch)
treed2892db8c323ef88398370e9120ac0cae4cdee20 /src/main/java/org/traccar
parent0ce8f90d8a8fd4315b439fe124ecebbd78ac4aa1 (diff)
parent61d07a123beeaa1e85f44046413a680aabda0c9c (diff)
downloadtrackermap-server-9889611b00b6159fddbdddc236448884886fe2ef.tar.gz
trackermap-server-9889611b00b6159fddbdddc236448884886fe2ef.tar.bz2
trackermap-server-9889611b00b6159fddbdddc236448884886fe2ef.zip
Merge pull request #4436 from flocsy/set-language
added language to watch protocol's set_timezone command
Diffstat (limited to 'src/main/java/org/traccar')
-rw-r--r--src/main/java/org/traccar/StringProtocolEncoder.java2
-rw-r--r--src/main/java/org/traccar/model/Command.java1
-rw-r--r--src/main/java/org/traccar/protocol/WatchProtocolEncoder.java2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/StringProtocolEncoder.java b/src/main/java/org/traccar/StringProtocolEncoder.java
index 40dfb25b6..e9fb65500 100644
--- a/src/main/java/org/traccar/StringProtocolEncoder.java
+++ b/src/main/java/org/traccar/StringProtocolEncoder.java
@@ -39,7 +39,7 @@ public abstract class StringProtocolEncoder extends BaseProtocolEncoder {
if (valueFormatter != null) {
value = valueFormatter.formatValue(keys[i], object);
}
- if (value == null) {
+ if (value == null && object != null) {
value = object.toString();
}
if (value == null) {
diff --git a/src/main/java/org/traccar/model/Command.java b/src/main/java/org/traccar/model/Command.java
index 336fc61f4..abe538a10 100644
--- a/src/main/java/org/traccar/model/Command.java
+++ b/src/main/java/org/traccar/model/Command.java
@@ -68,6 +68,7 @@ public class Command extends Message implements Cloneable {
public static final String KEY_UNIQUE_ID = "uniqueId";
public static final String KEY_FREQUENCY = "frequency";
+ public static final String KEY_LANGUAGE = "language";
public static final String KEY_TIMEZONE = "timezone";
public static final String KEY_DEVICE_PASSWORD = "devicePassword";
public static final String KEY_RADIUS = "radius";
diff --git a/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java b/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java
index 8871601a4..f285267ba 100644
--- a/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/WatchProtocolEncoder.java
@@ -161,7 +161,7 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin
case Command.TYPE_POSITION_PERIODIC:
return formatTextCommand(channel, command, "UPLOAD,%s", Command.KEY_FREQUENCY);
case Command.TYPE_SET_TIMEZONE:
- return formatTextCommand(channel, command, "LZ,,%s", Command.KEY_TIMEZONE);
+ return formatTextCommand(channel, command, "LZ,%s,%s", Command.KEY_LANGUAGE, Command.KEY_TIMEZONE);
case Command.TYPE_SET_INDICATOR:
return formatTextCommand(channel, command, "FLOWER,%s", Command.KEY_DATA);
default: