Refactoring

1 files changed, 13 insertions, 26 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 7abb6df5e..2cfea1f25 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
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.core.service.download;
 
 import android.util.Log;
 
-import com.squareup.okhttp.Credentials;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
@@ -18,19 +17,20 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Date;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.util.DownloadError;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.core.util.URIUtil;
+import okio.ByteString;
 
 public class HttpDownloader extends Downloader {
     private static final String TAG = "HttpDownloader";
@@ -99,13 +99,11 @@ public class HttpDownloader extends Downloader {
 
             Response response = httpClient.newCall(httpReq.build()).execute();
             responseBody = response.body();
-
             String contentEncodingHeader = response.header("Content-Encoding");
+            boolean isGzip = StringUtils.equalsIgnoreCase(contentEncodingHeader, "gzip");
 
-            final boolean isGzip = StringUtils.equalsIgnoreCase(contentEncodingHeader, "gzip");
+            Log.d(TAG, "Response code is " + response.code());
 
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Response code is " + response.code());
 
             if(!response.isSuccessful() && response.code() == HttpURLConnection.HTTP_NOT_MODIFIED) {
                 Log.d(TAG, "Feed '" + request.getSource() + "' not modified since last update, Download canceled");
@@ -151,22 +149,18 @@ public class HttpDownloader extends Downloader {
                 out = new RandomAccessFile(destination, "rw");
             }
 
-
             byte[] buffer = new byte[BUFFER_SIZE];
             int count = 0;
             request.setStatusMsg(R.string.download_running);
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Getting size of download");
+            Log.d(TAG, "Getting size of download");
             request.setSize(responseBody.contentLength() + request.getSoFar());
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Size is " + request.getSize());
+            Log.d(TAG, "Size is " + request.getSize());
             if (request.getSize() < 0) {
                 request.setSize(DownloadStatus.SIZE_UNKNOWN);
             }
 
             long freeSpace = StorageUtils.getFreeSpaceAvailable();
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Free space is " + freeSpace);
+            Log.d(TAG, "Free space is " + freeSpace);
 
             if (request.getSize() != DownloadStatus.SIZE_UNKNOWN
                     && request.getSize() > freeSpace) {
@@ -174,8 +168,7 @@ public class HttpDownloader extends Downloader {
                 return;
             }
 
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Starting download");
+            Log.d(TAG, "Starting download");
             while (!cancelled
                     && (count = connection.read(buffer)) != -1) {
                 out.write(buffer, 0, count);
@@ -226,15 +219,12 @@ public class HttpDownloader extends Downloader {
     }
 
     private void onSuccess() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Download was successful");
+        Log.d(TAG, "Download was successful");
         result.setSuccessful();
     }
 
     private void onFail(DownloadError reason, String reasonDetailed) {
-        if (BuildConfig.DEBUG) {
-            Log.d(TAG, "Download failed");
-        }
+        Log.d(TAG, "Download failed");
         result.setFailed(reason, reasonDetailed);
         if (request.isDeleteOnFailure()) {
             cleanup();
@@ -242,8 +232,7 @@ public class HttpDownloader extends Downloader {
     }
 
     private void onCancelled() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Download was cancelled");
+        Log.d(TAG, "Download was cancelled");
         result.setCancelled();
         cleanup();
     }
@@ -256,12 +245,10 @@ public class HttpDownloader extends Downloader {
             File dest = new File(request.getDestination());
             if (dest.exists()) {
                 boolean rc = dest.delete();
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Deleted file " + dest.getName() + "; Result: "
+                Log.d(TAG, "Deleted file " + dest.getName() + "; Result: "
                             + rc);
             } else {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "cleanup() didn't delete file: does not exist.");
+                Log.d(TAG, "cleanup() didn't delete file: does not exist.");
             }
         }
     }