From a712cf172d35f5eb42f12602403d54ceb3c8c61e Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Tue, 9 Dec 2014 06:04:52 +0000 Subject: [PATCH] do not check thumbnail/cover mime --- ChangeLog | 3 +++ .../geometerplus/fbreader/network/opds/OPDSBookItem.java | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index da798d0bc..5bf6f2db5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * (planned) Fixed authors list/tags list editing * (planned) CSS selectors priority +===== 2.2 beta 7 (Dec 08, 2014) ===== +* Fixed behaviour on feeds with incorrect mimetypes + ===== 2.1.10 (Dec 06, 2014) ===== * All changes from 2.2 beta 6 * New footer style diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java b/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java index 015e6f16c..8e4899e8b 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java @@ -113,13 +113,9 @@ public class OPDSBookItem extends NetworkBookItem implements OPDSConstants { final String rel = networkLink.relation(link.getRel(), mime); final UrlInfo.Type referenceType = typeByRelation(rel); if (REL_IMAGE_THUMBNAIL.equals(rel) || REL_THUMBNAIL.equals(rel)) { - if (MimeType.IMAGE_PNG.equals(mime) || MimeType.IMAGE_JPEG.equals(mime)) { - urls.addInfo(new UrlInfo(UrlInfo.Type.Thumbnail, href, mime)); - } + urls.addInfo(new UrlInfo(UrlInfo.Type.Thumbnail, href, mime)); } else if ((rel != null && rel.startsWith(REL_IMAGE_PREFIX)) || REL_COVER.equals(rel)) { - if (MimeType.IMAGE_PNG.equals(mime) || MimeType.IMAGE_JPEG.equals(mime)) { - urls.addInfo(new UrlInfo(UrlInfo.Type.Image, href, mime)); - } + urls.addInfo(new UrlInfo(UrlInfo.Type.Image, href, mime)); } else if (MimeType.APP_ATOM_XML.weakEquals(mime) && "entry".equals(mime.getParameter("type"))) { urls.addInfo(new UrlInfo(UrlInfo.Type.SingleEntry, href, mime));