From f49790953e6f9c3f9aa88564caf72a3bf002a801 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 13 Oct 2015 13:37:44 +1300
Subject: Fix some more style problems

---
 src/org/traccar/protocol/OsmAndProtocolDecoder.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/src/org/traccar/protocol/OsmAndProtocolDecoder.java b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
index e7ee74a30..f128c6414 100644
--- a/src/org/traccar/protocol/OsmAndProtocolDecoder.java
+++ b/src/org/traccar/protocol/OsmAndProtocolDecoder.java
@@ -59,7 +59,12 @@ public class OsmAndProtocolDecoder extends BaseProtocolDecoder {
         position.setProtocol(getProtocolName());
 
         // Identification
-        String id = params.get(params.containsKey("id") ? "id" : "deviceid").get(0);
+        String id;
+        if (params.containsKey("id")) {
+            id = params.get("id").get(0);
+        } else {
+            id = params.get("deviceid").get(0);
+        }
         if (!identify(id, channel)) {
             return null;
         }
-- 
cgit v1.2.3