Merge pull request #2127 from tananaev/refactor

Move device id to a session

1 files changed, 8 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
index a0f151ac2..0ce2ab780 100644
--- a/src/org/traccar/protocol/FlextrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
@@ -17,6 +17,7 @@ package org.traccar.protocol;
 
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
+import org.traccar.DeviceSession;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
@@ -87,12 +88,15 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
             String id = parser.next();
             String iccid = parser.next();
 
-            if (!identify(iccid, channel, remoteAddress, false) && !identify(id, channel, remoteAddress)) {
+            getDeviceSession(channel, remoteAddress, iccid, id);
+
+        } else if (sentence.contains("UNITSTAT")) {
+
+            DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+            if (deviceSession == null) {
                 return null;
             }
 
-        } else if (sentence.contains("UNITSTAT") && hasDeviceId()) {
-
             Parser parser = new Parser(PATTERN, sentence);
             if (!parser.matches()) {
                 return null;
@@ -100,7 +104,7 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
 
             Position position = new Position();
             position.setProtocol(getProtocolName());
-            position.setDeviceId(getDeviceId());
+            position.setDeviceId(deviceSession.getDeviceId());
 
             sendAcknowledgement(channel, parser.next());