1 files changed, 6 insertions, 1 deletions
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;
         }