Merge branch 'master' into set-language

# Conflicts:
#	src/main/java/org/traccar/StringProtocolEncoder.java
#	src/main/java/org/traccar/protocol/WatchProtocolEncoder.java

1 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java
index a8aa84105..5d7e63920 100644
--- a/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/Tk103ProtocolEncoder.java
@@ -50,7 +50,7 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
         if (alternative) {
             switch (command.getType()) {
                 case Command.TYPE_CUSTOM:
-                    return formatAlt(command, "{%s}", Command.KEY_DATA);
+                    return formatAlt(command, "%s", Command.KEY_DATA);
                 case Command.TYPE_GET_VERSION:
                     return formatAlt(command, "*about*");
                 case Command.TYPE_POWER_OFF:
@@ -74,36 +74,36 @@ public class Tk103ProtocolEncoder extends StringProtocolEncoder {
                 case Command.TYPE_ALARM_SOS:
                     return formatAlt(command, command.getBoolean(Command.KEY_ENABLE) ? "*soson*" : "*sosoff*");
                 case Command.TYPE_SET_CONNECTION:
-                    return formatAlt(command, "*setip*%s*{%s}*",
-                            command.getString(Command.KEY_SERVER).replace(".", "*"), Command.KEY_PORT);
+                    String server = command.getString(Command.KEY_SERVER).replace(".", "*");
+                    return formatAlt(command, "*setip*" + server + "*%s*", Command.KEY_PORT);
                 case Command.TYPE_SOS_NUMBER:
-                    return formatAlt(command, "*master*{%s}*{%s}*", Command.KEY_DEVICE_PASSWORD, Command.KEY_PHONE);
+                    return formatAlt(command, "*master*%s*%s*", Command.KEY_DEVICE_PASSWORD, Command.KEY_PHONE);
                 default:
                     return null;
             }
         } else {
             switch (command.getType()) {
                 case Command.TYPE_CUSTOM:
-                    return formatCommand(command, "({%s}{%s})", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
+                    return formatCommand(command, "(%s%s)", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
                 case Command.TYPE_GET_VERSION:
-                    return formatCommand(command, "({%s}AP07)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAP07)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_REBOOT_DEVICE:
-                    return formatCommand(command, "({%s}AT00)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAT00)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_SET_ODOMETER:
-                    return formatCommand(command, "({%s}AX01)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAX01)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_POSITION_SINGLE:
-                    return formatCommand(command, "({%s}AP00)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAP00)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_POSITION_PERIODIC:
-                    return formatCommand(command, "({%s}AR00%s0000)", Command.KEY_UNIQUE_ID,
-                            String.format("%04X", command.getInteger(Command.KEY_FREQUENCY)));
+                    String frequency = String.format("%04X", command.getInteger(Command.KEY_FREQUENCY));
+                    return formatCommand(command, "(%sAR00" + frequency + "0000)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_POSITION_STOP:
-                    return formatCommand(command, "({%s}AR0000000000)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAR0000000000)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_ENGINE_STOP:
-                    return formatCommand(command, "({%s}AV010)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAV010)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_ENGINE_RESUME:
-                    return formatCommand(command, "({%s}AV011)", Command.KEY_UNIQUE_ID);
+                    return formatCommand(command, "(%sAV011)", Command.KEY_UNIQUE_ID);
                 case Command.TYPE_OUTPUT_CONTROL:
-                    return formatCommand(command, "({%s}AV00{%s})", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
+                    return formatCommand(command, "(%sAV00%s)", Command.KEY_UNIQUE_ID, Command.KEY_DATA);
                 default:
                     return null;
             }