From 930ad2b2f3529e85219b93e2c969118e41d216ad Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Fri, 11 Dec 2015 14:58:30 +0100
Subject: [PATCH] Added URLDecoder cUnicode support

---
 Zutil.jar                           | Bin 1185325 -> 1185544 bytes
 src/zutil/parser/URLDecoder.java    |  55 ++++++++++++++++++----------
 test/zutil/test/URLDecoderTest.java |   5 ++-
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/Zutil.jar b/Zutil.jar
index 3c116df27545c3890669394249cc1b63679ca31c..b5f2a06537a52d37c1fbf2eb2f59e083218daaf1 100755
GIT binary patch
delta 3050
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
DD6f_^

delta 2841
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

diff --git a/src/zutil/parser/URLDecoder.java b/src/zutil/parser/URLDecoder.java
index 412a00c..853bd47 100755
--- a/src/zutil/parser/URLDecoder.java
+++ b/src/zutil/parser/URLDecoder.java
@@ -1,5 +1,9 @@
 package zutil.parser;
 
+import zutil.converters.Converter;
+
+import java.io.UnsupportedEncodingException;
+
 /**
  * This utility class will decode Strings encoded with % sign's to a normal String
  *
@@ -10,27 +14,40 @@ public class URLDecoder {
     public static String decode(String url){
         if(url == null)
             return null;
-        StringBuilder out = new StringBuilder();
-        for (int i=0; i<url.length(); ++i) {
-            char c = url.charAt(i);
-            switch (c){
-                case '+':
-                    out.append(' ');
-                    break;
-                case '%':
-                    if (i+2 < url.length()) {
-                        char ascii = (char)Integer.parseInt("" + url.charAt(i + 1) + url.charAt(i + 2), 16);
-                        out.append(ascii);
-                        i += 2;
-                    }
-                    else
+
+        try {
+            StringBuilder out = new StringBuilder();
+            byte[] buffer = null;
+            for (int i=0; i<url.length(); ++i) {
+                char c = url.charAt(i);
+                switch (c){
+                    case '+':
+                        out.append(' ');
+                        break;
+                    case '%':
+                        if (i+2 < url.length()) {
+                            if(buffer == null)
+                                buffer = new byte[url.length()];
+                            int bufferPos = 0;
+                            while(i<url.length() && url.charAt(i) == '%') {
+                                buffer[bufferPos++] = Converter.hexToByte(url.charAt(i + 1), url.charAt(i + 2));
+                                i += 3;
+                            }
+                            --i; // Go back one step as i will be incremented in the main for loop
+                            out.append(new String(buffer, 0, bufferPos, "UTF-8"));
+                        }
+                        else
+                            out.append(c);
+                        break;
+                    default:
                         out.append(c);
-                    break;
-                default:
-                    out.append(c);
-                    break;
+                        break;
+                }
             }
+            return out.toString();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace(); // Should never happen
         }
-        return out.toString();
+        return null;
     }
 }
diff --git a/test/zutil/test/URLDecoderTest.java b/test/zutil/test/URLDecoderTest.java
index f90935c..389ffaf 100755
--- a/test/zutil/test/URLDecoderTest.java
+++ b/test/zutil/test/URLDecoderTest.java
@@ -3,6 +3,8 @@ package zutil.test;
 import org.junit.Test;
 import zutil.parser.URLDecoder;
 
+import java.io.UnsupportedEncodingException;
+
 import static org.junit.Assert.assertEquals;
 
 
@@ -29,7 +31,8 @@ public class URLDecoderTest {
     }
 
     @Test
-    public void percentMultibyteTest(){
+    public void percentMultibyteTest() throws UnsupportedEncodingException {
+        assertEquals("Ängen", java.net.URLDecoder.decode("%C3%84ngen", "UTF-8"));
         assertEquals("Ängen", URLDecoder.decode("%C3%84ngen"));
     }
 }