From bad86d8284fb48bd130370eefb8d8c7ae25ab44c Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Tue, 31 Dec 2013 01:27:05 +0100
Subject: [PATCH] Escape URLs in HttpDownloader. fixes #329, #332

---
 .../service/download/HttpDownloader.java        | 17 +++++++++++++----
 .../service/download/HttpDownloaderTest.java    |  6 ++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/de/danoeh/antennapod/service/download/HttpDownloader.java b/src/de/danoeh/antennapod/service/download/HttpDownloader.java
index 582fb9575..94cf01188 100644
--- a/src/de/danoeh/antennapod/service/download/HttpDownloader.java
+++ b/src/de/danoeh/antennapod/service/download/HttpDownloader.java
@@ -6,9 +6,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
+import java.net.*;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.Header;
@@ -58,13 +56,24 @@ public class HttpDownloader extends Downloader {
         return httpClient;
     }
 
+    private URI getURIFromRequestUrl(String source) {
+        try {
+            URL url = new URL(source);
+            return new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef());
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException(e);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
     @Override
     protected void download() {
         DefaultHttpClient httpClient = null;
         BufferedOutputStream out = null;
         InputStream connection = null;
         try {
-            HttpGet httpGet = new HttpGet(request.getSource());
+            HttpGet httpGet = new HttpGet(getURIFromRequestUrl(request.getSource()));
             httpClient = createHttpClient();
             HttpResponse response = httpClient.execute(httpGet);
             HttpEntity httpEntity = response.getEntity();
diff --git a/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java b/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java
index 8df35ce67..5506a3bc9 100644
--- a/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java
+++ b/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java
@@ -108,6 +108,12 @@ public class HttpDownloaderTest extends InstrumentationTestCase {
         assertFalse(new File(feedFile.getFile_url()).exists());
     }
 
+    /* TODO: replace with smaller test file
+    public void testUrlWithSpaces() {
+        download("http://acedl.noxsolutions.com/ace/Don't Call Salman Rushdie Sneezy in Finland.mp3", "testUrlWithSpaces", true);
+    }
+    */
+
     private static class FeedFileImpl extends FeedFile {
         public FeedFileImpl(String download_url) {
             super(null, download_url, false);