1 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/protocol/RuptelaProtocolEncoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolEncoder.java
index 51967403d..fb0dcf690 100644
--- a/src/main/java/org/traccar/protocol/RuptelaProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/RuptelaProtocolEncoder.java
@@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.traccar.BaseProtocolEncoder;
 import org.traccar.helper.Checksum;
+import org.traccar.helper.DataConverter;
 import org.traccar.model.Command;
 import org.traccar.Protocol;
 
@@ -30,7 +31,7 @@ public class RuptelaProtocolEncoder extends BaseProtocolEncoder {
         super(protocol);
     }
 
-    private ByteBuf encodeContent(int type, ByteBuf content) {
+    public static ByteBuf encodeContent(int type, ByteBuf content) {
 
         ByteBuf buf = Unpooled.buffer();
 
@@ -49,8 +50,14 @@ public class RuptelaProtocolEncoder extends BaseProtocolEncoder {
 
         switch (command.getType()) {
             case Command.TYPE_CUSTOM:
-                content.writeBytes(command.getString(Command.KEY_DATA).getBytes(StandardCharsets.US_ASCII));
-                return encodeContent(RuptelaProtocolDecoder.MSG_SMS_VIA_GPRS, content);
+                String data = command.getString(Command.KEY_DATA);
+                if (data.matches("(\\p{XDigit}{2})+")) {
+                    content.writeBytes(DataConverter.parseHex(data));
+                    return content;
+                } else {
+                    content.writeBytes(data.getBytes(StandardCharsets.US_ASCII));
+                    return encodeContent(RuptelaProtocolDecoder.MSG_SMS_VIA_GPRS, content);
+                }
             case Command.TYPE_REQUEST_PHOTO:
                 content.writeByte(1); // sub-command
                 content.writeByte(0); // source