Merge pull request #857 from mfietz/issue/854-gzip-not-exhausted

Fixes "gzip finished without exhausting source" error

1 files changed, 14 insertions, 7 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index ac0fe8036..40b7de170 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -188,13 +188,17 @@ public class HttpDownloader extends Downloader {
             }
 
             Log.d(TAG, "Starting download");
-            while (!cancelled
-                    && (count = connection.read(buffer)) != -1) {
-                out.write(buffer, 0, count);
-                request.setSoFar(request.getSoFar() + count);
-                request.setProgressPercent((int) (((double) request
-                        .getSoFar() / (double) request
-                        .getSize()) * 100));
+            try {
+                while (!cancelled
+                        && (count = connection.read(buffer)) != -1) {
+                    out.write(buffer, 0, count);
+                    request.setSoFar(request.getSoFar() + count);
+                    request.setProgressPercent((int) (((double) request
+                            .getSoFar() / (double) request
+                            .getSize()) * 100));
+                }
+            } catch(IOException e) {
+                Log.e(TAG, Log.getStackTraceString(e));
             }
             if (cancelled) {
                 onCancelled();
@@ -210,6 +214,9 @@ public class HttpDownloader extends Downloader {
                                     request.getSize()
                     );
                     return;
+                } else if(request.getSize() > 0 && request.getSoFar() == 0){
+                    onFail(DownloadError.ERROR_IO_ERROR, "Download completed, but nothing was read");
+                    return;
                 }
                 onSuccess();
             }