From 2a3fad9496decd83f06ae5abf067f8d4337ec741 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 23 Apr 2015 15:49:56 +1200
Subject: Major code refacroting

---
 .../traccar/protocol/VisiontekProtocolDecoder.java | 23 ++++++----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

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

diff --git a/src/org/traccar/protocol/VisiontekProtocolDecoder.java b/src/org/traccar/protocol/VisiontekProtocolDecoder.java
index 242ac1083..b61500bd9 100644
--- a/src/org/traccar/protocol/VisiontekProtocolDecoder.java
+++ b/src/org/traccar/protocol/VisiontekProtocolDecoder.java
@@ -32,8 +32,8 @@ import org.traccar.model.Position;
 
 public class VisiontekProtocolDecoder extends BaseProtocolDecoder {
 
-    public VisiontekProtocolDecoder(DataManager dataManager, String protocol, Properties properties) {
-        super(dataManager, protocol, properties);
+    public VisiontekProtocolDecoder(String protocol) {
+        super(protocol);
     }
 
     private static final Pattern pattern = Pattern.compile(
@@ -81,22 +81,11 @@ public class VisiontekProtocolDecoder extends BaseProtocolDecoder {
         // Device identification
         String id = parser.group(index++);
         String imei = parser.group(index++);
-        try {
-            position.setDeviceId(getDataManager().getDeviceByImei(id).getId());
-        } catch(Exception error) {
-            if (imei != null) {
-                try {
-                    position.setDeviceId(getDataManager().getDeviceByImei(imei).getId());
-                } catch(Exception error2) {
-                    Log.warning("Unknown device - " + id);
-                    return null;
-                }
-            } else {
-                Log.warning("Unknown device - " + id);
-                return null;
-            }
+        if (!identify(id, false) && !identify(imei)) {
+            return null;
         }
-        
+        position.setDeviceId(getDeviceId());
+
         // Date
         Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         time.clear();
-- 
cgit v1.2.3