Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shutdown connection manager after download

This commit is contained in:
daniel oeh 2013-03-11 14:30:26 +01:00
parent 35f53c74eb
commit cdf73fd1f7
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/de/danoeh/antennapod/service/download/HttpDownloader.java
View File

@ -54,9 +54,10 @@ public class HttpDownloader extends Downloader {
HttpConnectionParams.setSoTimeout(params, SOCKET_TIMEOUT); HttpConnectionParams.setSoTimeout(params, SOCKET_TIMEOUT);
HttpConnectionParams.setConnectionTimeout(params, CONNECTION_TIMEOUT); HttpConnectionParams.setConnectionTimeout(params, CONNECTION_TIMEOUT);
HttpClientParams.setRedirecting(params, true); HttpClientParams.setRedirecting(params, true);
// Workaround for broken URLs in redirection // Workaround for broken URLs in redirection
((AbstractHttpClient)httpClient).setRedirectHandler(new APRedirectHandler()); ((AbstractHttpClient) httpClient)
.setRedirectHandler(new APRedirectHandler());
return httpClient; return httpClient;
} }
@ -79,7 +80,8 @@ public class HttpDownloader extends Downloader {
File destination = new File(status.getFeedFile() File destination = new File(status.getFeedFile()
.getFile_url()); .getFile_url());
if (!destination.exists()) { if (!destination.exists()) {
connection = AndroidHttpClient.getUngzippedContent(httpEntity); connection = AndroidHttpClient
.getUngzippedContent(httpEntity);
InputStream in = new BufferedInputStream(connection); InputStream in = new BufferedInputStream(connection);
out = new BufferedOutputStream(new FileOutputStream( out = new BufferedOutputStream(new FileOutputStream(
destination)); destination));
@ -148,6 +150,9 @@ public class HttpDownloader extends Downloader {
} finally { } finally {
IOUtils.closeQuietly(connection); IOUtils.closeQuietly(connection);
IOUtils.closeQuietly(out); IOUtils.closeQuietly(out);
if (httpClient != null) {
httpClient.getConnectionManager().shutdown();
}
} }
} }
@ -178,16 +183,20 @@ public class HttpDownloader extends Downloader {
status.setCancelled(true); status.setCancelled(true);
cleanup(); cleanup();
} }
/** Deletes unfinished downloads. */ /** Deletes unfinished downloads. */
private void cleanup() { private void cleanup() {
if (status != null && status.getFeedFile() != null && status.getFeedFile().getFile_url() != null) { if (status != null && status.getFeedFile() != null
&& status.getFeedFile().getFile_url() != null) {
File dest = new File(status.getFeedFile().getFile_url()); File dest = new File(status.getFeedFile().getFile_url());
if (dest.exists()) { if (dest.exists()) {
boolean rc = dest.delete(); boolean rc = dest.delete();
if (AppConfig.DEBUG) Log.d(TAG, "Deleted file " + dest.getName() + "; Result: " + rc); if (AppConfig.DEBUG)
Log.d(TAG, "Deleted file " + dest.getName() + "; Result: "
+ rc);
} else { } else {
if (AppConfig.DEBUG) Log.d(TAG, "cleanup() didn't delete file: does not exist."); if (AppConfig.DEBUG)
Log.d(TAG, "cleanup() didn't delete file: does not exist.");
} }
} }
} }