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

Disabled downloading of episode images. closes #390 

Uses too much bandwidth
This commit is contained in:
daniel oeh 2014-03-31 19:47:06 +02:00
parent b2de7512f4
commit a4b78501dc
3 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/de/danoeh/antennapod/feed/FeedItem.java
View File

@ -280,7 +280,7 @@ public class FeedItem extends FeedComponent implements
@Override
public InputStream openImageInputStream() {
InputStream out = null;
if (hasItemImage()) {
if (hasItemImageDownloaded()) {
out = image.openImageInputStream();
} else if (hasMedia()) {
out = media.openImageInputStream();
@ -293,7 +293,7 @@ public class FeedItem extends FeedComponent implements
@Override
public InputStream reopenImageInputStream(InputStream input) {
InputStream out = null;
if (hasItemImage()) {
if (hasItemImageDownloaded()) {
out = image.reopenImageInputStream(input);
} else if (hasMedia()) {
out = media.reopenImageInputStream(input);
@ -306,7 +306,7 @@ public class FeedItem extends FeedComponent implements
@Override
public String getImageLoaderCacheKey() {
String out = null;
if (hasItemImage()) {
if (hasItemImageDownloaded()) {
out = image.getImageLoaderCacheKey();
} else if (hasMedia()) {
out = media.getImageLoaderCacheKey();
@ -346,6 +346,13 @@ public class FeedItem extends FeedComponent implements
return image != null;
}
/**
* Returns true if this FeedItem has its own image and the image has been downloaded.
*/
public boolean hasItemImageDownloaded() {
return image != null && image.isDownloaded();
}
@Override
public String getHumanReadableIdentifier() {
return title;

6
src/de/danoeh/antennapod/feed/FeedMedia.java
View File

@ -204,7 +204,7 @@ public class FeedMedia extends FeedFile implements Playable {
public FeedImage getImage() {
if (item != null) {
return (item.hasItemImage()) ? item.getImage() : item.getFeed().getImage();
return (item.hasItemImageDownloaded()) ? item.getImage() : item.getFeed().getImage();
}
return null;
}
@ -384,7 +384,7 @@ public class FeedMedia extends FeedFile implements Playable {
@Override
public InputStream openImageInputStream() {
InputStream out;
if (item.hasItemImage()) {
if (item.hasItemImageDownloaded()) {
out = item.openImageInputStream();
} else {
out = new Playable.DefaultPlayableImageLoader(this)
@ -401,7 +401,7 @@ public class FeedMedia extends FeedFile implements Playable {
@Override
public String getImageLoaderCacheKey() {
String out;
if (item.hasItemImage()) {
if (item.hasItemImageDownloaded()) {
out = item.getImageLoaderCacheKey();
} else {
out = new Playable.DefaultPlayableImageLoader(this)

26
src/de/danoeh/antennapod/service/download/DownloadService.java
View File

@ -678,32 +678,6 @@ public class DownloadService extends Service {
);
}
}
// download FeedItem images if provided and not downloaded
for (FeedItem item : savedFeed.getItems()) {
if (item.hasItemImage() && (!item.getImage().isDownloaded())) {
if (BuildConfig.DEBUG)
Log.d(TAG, "Item has image; Downloading....");
try {
requester.downloadImage(DownloadService.this,
item.getImage());
} catch (DownloadRequestException e) {
e.printStackTrace();
DBWriter.addDownloadStatus(
DownloadService.this,
new DownloadStatus(
item.getImage(),
item
.getImage()
.getHumanReadableIdentifier(),
DownloadError.ERROR_REQUEST_ERROR,
false, e.getMessage()
)
);
}
}
}
} catch (SAXException e) {
successful = false;
e.printStackTrace();