Add URL Encoding back.

src/com/dmdirc/util/collections/URLEncodingMapFlattener.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.util.collections;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+/**
+ * Flattens a map into a key=value pair, URLEncoding both the key and the entry.
+ */
+public class URLEncodingMapFlattener
+        implements Function<Map.Entry<String, String>, Stream<String>> {
+
+    @Override
+    public Stream<String> apply(final Map.Entry<String, String> entry) {
+        String key;
+        String value;
+        try {
+            key = URLEncoder.encode(entry.getKey(), "UTF-8");
+            value = URLEncoder.encode(entry.getValue(), "UTF-8");
+        } catch (UnsupportedEncodingException ex){
+            key = entry.getKey();
+            value = entry.getValue();
+        }
+        return Stream.of(key + '=' + value);
+    }
+}

src/com/dmdirc/util/io/Downloader.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.util.io;
 
+import com.dmdirc.util.collections.URLEncodingMapFlattener;
+
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -79,7 +81,8 @@ public class Downloader {
      */
     public List<String> getPage(final String url,
             final Map<String, String> postData) throws IOException {
-        return getPage(url, postData.entrySet().stream().map(Object::toString)
+        return getPage(url, postData.entrySet().stream()
+                .flatMap(e -> new URLEncodingMapFlattener().apply(e))
                 .collect(Collectors.joining("&")));
     }
 

src/com/dmdirc/util/io/ListenerInputStream.java

@@ -29,7 +29,8 @@ import java.io.InputStream;
 import javax.annotation.Nonnull;
 
 /**
- *
+ * Wrapped {@link InputStream} that provides updates to a {@link DownloadListener} as it reads a
+ * stream.
  */
 public class ListenerInputStream extends FilterInputStream {
 
@@ -38,6 +39,13 @@ public class ListenerInputStream extends FilterInputStream {
     private int count;
     private int mark;
 
+    /**
+     * Creates a new stream.
+     *
+     * @param in        Stream to wrap
+     * @param listener  Listener to gives up dates to
+     * @param length    Length of the stream, if -1 the listener will be indeterminate
+     */
     public ListenerInputStream(@Nonnull final InputStream in, final DownloadListener listener,
             final int length) {
         super(in);
@@ -98,6 +106,13 @@ public class ListenerInputStream extends FilterInputStream {
         return super.markSupported();
     }
 
+    /**
+     * Updates the listener and total read count.
+     *
+     * @param read Number of bytes further into stream.
+     *
+     * @return Returns the number of bytes read.
+     */
     private int update(final int read) {
         if (read > 0) {
             count += read;

test/com/dmdirc/util/io/DownloaderTest.java

@@ -104,6 +104,20 @@ public class DownloaderTest {
         assertTrue(postDataString1.equals(os.toString()) || postDataString2.equals(os.toString()));
     }
 
+    @Test
+    public void testGetPageMapEncoding() throws IOException {
+        final Map<String, String> postData = Maps.newHashMap();
+        postData.put("ke&y1", "value1");
+        postData.put("key2", "val&ue2");
+        new TestableDownloader().getPage("rar", postData);
+        verify(mockedConnection).setRequestProperty("Content-Type",
+                "application/x-www-form-urlencoded");
+
+        final String postDataString1 = "ke%26y1=value1&key2=val%26ue2";
+        final String postDataString2 = "key2=val%26ue2&ke%26y1=value1";
+        assertTrue(postDataString1.equals(os.toString()) || postDataString2.equals(os.toString()));
+    }
+
     @Test
     public void testDownloadPage() throws IOException {
         final Path file = fakeFS.getPath("test.txt");