3 files changed, 64 insertions, 23 deletions

diff --git a/src/org/traccar/helper/DataConverter.java b/src/org/traccar/helper/DataConverter.java
new file mode 100644
index 000000000..7abd4ae93
--- /dev/null
+++ b/src/org/traccar/helper/DataConverter.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.helper;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Hex;
+
+public final class DataConverter {
+
+    private DataConverter() {
+    }
+
+    public static byte[] parseHex(String string) {
+        try {
+            return Hex.decodeHex(string);
+        } catch (DecoderException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String printHex(byte[] data) {
+        return Hex.encodeHexString(data);
+    }
+
+    public static byte[] parseBase64(String string) {
+        return Base64.decodeBase64(string);
+    }
+
+    public static String printBase64(byte[] data) {
+        return Base64.encodeBase64String(data);
+    }
+
+}
diff --git a/src/org/traccar/helper/Hashing.java b/src/org/traccar/helper/Hashing.java
index 3fcc124fa..e91310eda 100644
--- a/src/org/traccar/helper/Hashing.java
+++ b/src/org/traccar/helper/Hashing.java
@@ -17,7 +17,6 @@ package org.traccar.helper;
 
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
-import javax.xml.bind.DatatypeConverter;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
@@ -75,13 +74,13 @@ public final class Hashing {
         RANDOM.nextBytes(salt);
         byte[] hash = function(password.toCharArray(), salt);
         return new HashingResult(
-                DatatypeConverter.printHexBinary(hash),
-                DatatypeConverter.printHexBinary(salt));
+                DataConverter.printHex(hash),
+                DataConverter.printHex(salt));
     }
 
     public static boolean validatePassword(String password, String hashHex, String saltHex) {
-        byte[] hash = DatatypeConverter.parseHexBinary(hashHex);
-        byte[] salt = DatatypeConverter.parseHexBinary(saltHex);
+        byte[] hash = DataConverter.parseHex(hashHex);
+        byte[] salt = DataConverter.parseHex(saltHex);
         return slowEquals(hash, function(password.toCharArray(), salt));
     }
 
diff --git a/src/org/traccar/helper/ObdDecoder.java b/src/org/traccar/helper/ObdDecoder.java
index 4bc3bcdfb..1bdcce352 100644
--- a/src/org/traccar/helper/ObdDecoder.java
+++ b/src/org/traccar/helper/ObdDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,15 +29,6 @@ public final class ObdDecoder {
     private static final int MODE_FREEZE_FRAME = 0x02;
     private static final int MODE_CODES = 0x03;
 
-    private static final int PID_ENGINE_LOAD = 0x04;
-    private static final int PID_COOLANT_TEMPERATURE = 0x05;
-    private static final int PID_ENGINE_RPM = 0x0C;
-    private static final int PID_VEHICLE_SPEED = 0x0D;
-    private static final int PID_THROTTLE_POSITION = 0x11;
-    private static final int PID_MIL_DISTANCE = 0x21;
-    private static final int PID_FUEL_LEVEL = 0x2F;
-    private static final int PID_DISTANCE_CLEARED = 0x31;
-
     public static Map.Entry<String, Object> decode(int mode, String value) {
         switch (mode) {
             case MODE_CURRENT:
@@ -86,21 +77,25 @@ public final class ObdDecoder {
 
     public static Map.Entry<String, Object> decodeData(int pid, int value, boolean convert) {
         switch (pid) {
-            case PID_ENGINE_LOAD:
+            case 0x04:
                 return createEntry(Position.KEY_ENGINE_LOAD, convert ? value * 100 / 255 : value);
-            case PID_COOLANT_TEMPERATURE:
+            case 0x05:
                 return createEntry(Position.KEY_COOLANT_TEMP, convert ? value - 40 : value);
-            case PID_ENGINE_RPM:
+            case 0x0B:
+                return createEntry("mapIntake", value);
+            case 0x0C:
                 return createEntry(Position.KEY_RPM, convert ? value / 4 : value);
-            case PID_VEHICLE_SPEED:
+            case 0x0D:
                 return createEntry(Position.KEY_OBD_SPEED, value);
-            case PID_THROTTLE_POSITION:
+            case 0x0F:
+                return createEntry("intakeTemp", convert ? value - 40 : value);
+            case 0x11:
                 return createEntry(Position.KEY_THROTTLE, convert ? value * 100 / 255 : value);
-            case PID_MIL_DISTANCE:
+            case 0x21:
                 return createEntry("milDistance", value);
-            case PID_FUEL_LEVEL:
+            case 0x2F:
                 return createEntry(Position.KEY_FUEL_LEVEL, convert ? value * 100 / 255 : value);
-            case PID_DISTANCE_CLEARED:
+            case 0x31:
                 return createEntry("clearedDistance", value);
             default:
                 return null;