Iv hex encoding

src/main/java/com/iheartradio/m3u8/ParseUtil.java

@@ -29,7 +29,7 @@ public static <T extends Enum<T>> T parseEnum(String string, Class<T> enumType,
             throw ParseException.create(ParseExceptionType.NOT_JAVA_ENUM, tag, string);
         }
     }
-    
+
     public static String parseDateTime(String string, String tag) throws ParseException {
         Matcher matcher = Constants.EXT_X_PROGRAM_DATE_TIME_PATTERN.matcher(string);
 
@@ -54,17 +54,20 @@ public static List<Byte> parseHexadecimal(String hexString, String tag) throws P
 
         if (matcher.matches()) {
             String valueString = matcher.group(1);
+            if (valueString.length() % 2 != 0) {
+                throw ParseException.create(ParseExceptionType.INVALID_HEXADECIMAL_STRING, tag, hexString);
+            }
 
-            for (char c : valueString.toCharArray()) {
-                bytes.add(hexCharToByte(c));
+            for (int i = 0; i < valueString.length(); i += 2) {
+                bytes.add((byte)(Short.parseShort(valueString.substring(i, i+2), 16) & 0xFF));
             }
 
             return bytes;
         } else {
             throw ParseException.create(ParseExceptionType.INVALID_HEXADECIMAL_STRING, tag, hexString);
         }
     }
-    
+
     private static byte hexCharToByte(char hex) {
         if (hex >= 'A') {
             return (byte) ((hex & 0xF) + 9);
@@ -183,7 +186,7 @@ public static List<Attribute> parseAttributeList(String line, String tag) throws
                 //Even Apple playlists have sometimes spaces after a ,
                 final String name = string.substring(0, separator).trim();
                 final String value = string.substring(separator + 1);
-                
+
                 if (name.isEmpty()) {
                     throw ParseException.create(ParseExceptionType.MISSING_ATTRIBUTE_NAME, tag, attributes.toString());
                 }

src/main/java/com/iheartradio/m3u8/WriteUtil.java

@@ -25,7 +25,7 @@ public static String writeHexadecimal(List<Byte> hex) {
         StringBuilder builder = new StringBuilder(hex.size() + prefix.length());
         builder.append(prefix);
         for(Byte b : hex) {
-            builder.append(Integer.toHexString(b));
+            builder.append(String.format("%02x", b));
         }
         return builder.toString();
     }

src/test/java/com/iheartradio/m3u8/ParseUtilParseHexadecimalTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, Spiideo
+ */
+
+package com.iheartradio.m3u8;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * @author Raniz
+ * @since 02/08/17.
+ */
+@RunWith(Parameterized.class)
+public class ParseUtilParseHexadecimalTest {
+
+    @Parameterized.Parameters(name = "{index}: {1}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {Arrays.asList((byte) 0), "0x00"},
+                {Arrays.asList((byte) 1), "0x01"},
+                {Arrays.asList((byte) -1), "0xff"},
+                {Arrays.asList((byte) -16), "0xf0"},
+                {Arrays.asList((byte) 0, (byte) 1), "0x0001"},
+                {Arrays.asList((byte) 1, (byte) 1), "0x0101"},
+                {Arrays.asList((byte) -1, (byte) -1), "0xffff"},
+                {Arrays.asList((byte) -121, (byte) -6), "0x87fa"},
+                {Arrays.asList((byte) 75, (byte) 118), "0x4b76"},
+        });
+    }
+
+    private final List<Byte> expected;
+    private final String input;
+
+    public ParseUtilParseHexadecimalTest(final List<Byte> expected, final String input) {
+        this.expected = expected;
+        this.input = input;
+    }
+
+    @Test
+    public void parseHexadecimal() throws Exception {
+        Assert.assertEquals(expected, ParseUtil.parseHexadecimal(input, ""));
+    }
+
+}

src/test/java/com/iheartradio/m3u8/WriteUtilWriteHexadecimalTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, Spiideo
+ */
+
+package com.iheartradio.m3u8;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * @author Raniz
+ * @since 02/08/17.
+ */
+@RunWith(Parameterized.class)
+public class WriteUtilWriteHexadecimalTest {
+
+    @Parameterized.Parameters(name = "{index}: {1}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {Arrays.asList((byte) 0), "0x00"},
+                {Arrays.asList((byte) 1), "0x01"},
+                {Arrays.asList((byte) -1), "0xff"},
+                {Arrays.asList((byte) -16), "0xf0"},
+                {Arrays.asList((byte) 0, (byte) 1), "0x0001"},
+                {Arrays.asList((byte) 1, (byte) 1), "0x0101"},
+                {Arrays.asList((byte) -1, (byte) -1), "0xffff"},
+                {Arrays.asList((byte) -121, (byte) -6), "0x87fa"},
+                {Arrays.asList((byte) 75, (byte) 118), "0x4b76"},
+        });
+    }
+
+    private final List<Byte> input;
+    private final String expected;
+
+    public WriteUtilWriteHexadecimalTest(final List<Byte> input, final String expected) {
+        this.input = input;
+        this.expected = expected;
+    }
+
+    @Test
+    public void writeHexadecimal() throws Exception {
+        Assert.assertEquals(expected, WriteUtil.writeHexadecimal(input));
+    }
+
+}