From d1c4cd526845aad56c5b0a3e20454638bbc7fecc Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 29 Jun 2015 10:48:34 +1200
Subject: Merge commands implmentation (fix #1271)

---
 src/org/traccar/protocol/TramigoProtocolDecoder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/protocol/TramigoProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/TramigoProtocolDecoder.java b/src/org/traccar/protocol/TramigoProtocolDecoder.java
index 38b343ad9..7694d1dcb 100644
--- a/src/org/traccar/protocol/TramigoProtocolDecoder.java
+++ b/src/org/traccar/protocol/TramigoProtocolDecoder.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
 
 public class TramigoProtocolDecoder extends BaseProtocolDecoder {
 
-    public TramigoProtocolDecoder(String protocol) {
+    public TramigoProtocolDecoder(TramigoProtocol protocol) {
         super(protocol);
     }
 
@@ -61,12 +61,12 @@ public class TramigoProtocolDecoder extends BaseProtocolDecoder {
 
         // Create new position
         Position position = new Position();
-        position.setProtocol(getProtocol());
+        position.setProtocol(getProtocolName());
         position.set(Event.KEY_INDEX, index);
         position.setValid(true);
 
         // Get device id
-        if (!identify(String.valueOf(id))) {
+        if (!identify(String.valueOf(id), channel)) {
             return null;
         }
         position.setDeviceId(getDeviceId());
-- 
cgit v1.2.3