From 989ea3ab0f72a3ed48ce38777250c609cfe994e5 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 4 Dec 2010 03:47:34 +0000 Subject: [PATCH] MimeTypes refactoring; ZLLoadableImage is introduced --- .../fbreader/network/NetworkBaseActivity.java | 12 ++++++------ .../fbreader/network/NetworkBookInfoActivity.java | 5 +++-- .../android/fbreader/network/NetworkView.java | 9 +++++---- .../fbreader/formats/fb2/FB2CoverReader.java | 5 ++--- .../fbreader/formats/oeb/OEBBookReader.java | 4 ++-- .../fbreader/formats/oeb/OEBCoverReader.java | 4 ++-- .../fbreader/formats/oeb/OEBMetaInfoReader.java | 2 +- .../formats/pdb/MobipocketHtmlBookReader.java | 2 +- .../fbreader/formats/plucker/PluckerBookReader.java | 2 +- .../fbreader/formats/xhtml/XHTMLTagImageAction.java | 2 +- .../fbreader/network/Base64EncodedImage.java | 2 +- .../geometerplus/fbreader/network/NetworkImage.java | 9 ++++++++- .../geometerplus/fbreader/network/NetworkTree.java | 2 +- .../authentication/litres/LitResXMLReader.java | 3 ++- .../fbreader/network/opds/CatalogInfoReader.java | 2 +- .../fbreader/network/opds/HtmlToString.java | 12 +++++------- .../fbreader/network/opds/NetworkOPDSFeedReader.java | 3 +-- .../fbreader/network/opds/OPDSLinkXMLReader.java | 5 ++--- .../fbreader/network/opds/OPDSXMLReader.java | 5 +---- .../fbreader/network/opds/OpenSearchXMLReader.java | 5 ++--- .../zlibrary/core/constants/MimeTypes.java | 4 +++- .../zlibrary/core/constants/XMLNamespaces.java | 2 +- .../zlibrary/core/image/ZLLoadableImage.java | 1 + .../ui/android/image/ZLAndroidImageManager.java | 3 ++- 24 files changed, 55 insertions(+), 50 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java index 60479fd16..640666bd8 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java @@ -38,13 +38,13 @@ import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.image.ZLLoadableImage; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.fbreader.network.NetworkTree; -import org.geometerplus.fbreader.network.NetworkImage; import org.geometerplus.fbreader.network.tree.NetworkBookTree; import org.geometerplus.android.fbreader.tree.ZLAndroidTree; @@ -123,21 +123,21 @@ abstract class NetworkBaseActivity extends ListActivity if (cover != null) { ZLAndroidImageData data = null; final ZLAndroidImageManager mgr = (ZLAndroidImageManager) ZLAndroidImageManager.Instance(); - if (cover instanceof NetworkImage) { - final NetworkImage img = (NetworkImage) cover; + if (cover instanceof ZLLoadableImage) { + final ZLLoadableImage img = (ZLLoadableImage)cover; if (img.isSynchronized()) { data = mgr.getImageData(img); - } else if (!myAwaitedCovers.contains(img.Url)) { + } else if (!myAwaitedCovers.contains(img.getId())) { final Runnable runnable = new Runnable() { public void run() { - myAwaitedCovers.remove(img.Url); + myAwaitedCovers.remove(img.getId()); final ListView view = NetworkBaseActivity.this.getListView(); view.invalidateViews(); } }; final NetworkView networkView = NetworkView.Instance(); networkView.performCoverSynchronization(img, runnable); - myAwaitedCovers.add(img.Url); + myAwaitedCovers.add(img.getId()); } } else { data = mgr.getImageData(cover); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index c8519b79e..2e41e4a5c 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -36,6 +36,7 @@ import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.image.ZLLoadableImage; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData; @@ -189,8 +190,8 @@ public class NetworkBookInfoActivity extends Activity implements NetworkView.Eve if (cover != null) { ZLAndroidImageData data = null; final ZLAndroidImageManager mgr = (ZLAndroidImageManager) ZLAndroidImageManager.Instance(); - if (cover instanceof NetworkImage) { - final NetworkImage img = (NetworkImage) cover; + if (cover instanceof ZLLoadableImage) { + final ZLLoadableImage img = (ZLLoadableImage)cover; final NetworkView networkView = NetworkView.Instance(); if (networkView.isInitialized()) { networkView.performCoverSynchronization(img, new Runnable() { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkView.java b/src/org/geometerplus/android/fbreader/network/NetworkView.java index c52786cbc..25a1560ec 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkView.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkView.java @@ -34,6 +34,7 @@ import android.os.Message; import android.view.MenuItem; import android.view.Menu; +import org.geometerplus.zlibrary.core.image.ZLLoadableImage; import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.fbreader.network.*; @@ -231,8 +232,8 @@ class NetworkView { private final CoverSynchronizedHandler myCoverSynchronizedHandler = new CoverSynchronizedHandler(); - public void performCoverSynchronization(final NetworkImage image, Runnable finishRunnable) { - LinkedList runnables = myOnCoverSyncRunnables.get(image.Url); + public void performCoverSynchronization(final ZLLoadableImage image, Runnable finishRunnable) { + LinkedList runnables = myOnCoverSyncRunnables.get(image.getId()); if (runnables != null) { runnables.add(finishRunnable); return; @@ -240,12 +241,12 @@ class NetworkView { runnables = new LinkedList(); runnables.add(finishRunnable); - myOnCoverSyncRunnables.put(image.Url, runnables); + myOnCoverSyncRunnables.put(image.getId(), runnables); myPool.execute(new Runnable() { public void run() { image.synchronize(); - myCoverSynchronizedHandler.fireMessage(image.Url); + myCoverSynchronizedHandler.fireMessage(image.getId()); } }); } diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2CoverReader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2CoverReader.java index 1f072312a..e276e0635 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2CoverReader.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2CoverReader.java @@ -21,13 +21,12 @@ package org.geometerplus.fbreader.formats.fb2; import java.util.*; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.xml.*; -import org.geometerplus.fbreader.constants.XMLNamespaces; -import org.geometerplus.fbreader.constants.MimeTypes; - public class FB2CoverReader extends ZLXMLReaderAdapter { private boolean myReadCoverPage; private String myImageReference; diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java index bdac79b6c..bc3ba44f0 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java @@ -21,6 +21,8 @@ package org.geometerplus.fbreader.formats.oeb; import java.util.*; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.image.ZLFileImage; @@ -28,8 +30,6 @@ import org.geometerplus.zlibrary.core.image.ZLFileImage; import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.fbreader.formats.xhtml.XHTMLReader; import org.geometerplus.fbreader.formats.util.MiscUtil; -import org.geometerplus.fbreader.constants.XMLNamespaces; -import org.geometerplus.fbreader.constants.MimeTypes; class Reference { public final String Title; diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBCoverReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBCoverReader.java index b133d33ff..c7f5ea983 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBCoverReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBCoverReader.java @@ -19,13 +19,13 @@ package org.geometerplus.fbreader.formats.oeb; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.image.ZLFileImage; import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.xml.*; -import org.geometerplus.fbreader.constants.XMLNamespaces; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.formats.util.MiscUtil; class OEBCoverReader extends ZLXMLReaderAdapter implements XMLNamespaces, MimeTypes { diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java index 6e81e9212..3a878aba1 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBMetaInfoReader.java @@ -21,11 +21,11 @@ package org.geometerplus.fbreader.formats.oeb; import java.util.*; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.fbreader.library.Book; -import org.geometerplus.fbreader.constants.XMLNamespaces; class OEBMetaInfoReader extends ZLXMLReaderAdapter implements XMLNamespaces { private final Book myBook; diff --git a/src/org/geometerplus/fbreader/formats/pdb/MobipocketHtmlBookReader.java b/src/org/geometerplus/fbreader/formats/pdb/MobipocketHtmlBookReader.java index bcdb5d71a..a0756690a 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/MobipocketHtmlBookReader.java +++ b/src/org/geometerplus/fbreader/formats/pdb/MobipocketHtmlBookReader.java @@ -23,11 +23,11 @@ import java.util.*; import java.io.*; import java.nio.charset.CharsetDecoder; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.image.ZLFileImage; import org.geometerplus.zlibrary.core.html.ZLByteBuffer; import org.geometerplus.zlibrary.core.html.ZLHtmlAttributeMap; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.formats.html.HtmlReader; import org.geometerplus.fbreader.formats.html.HtmlTag; import org.geometerplus.fbreader.bookmodel.BookModel; diff --git a/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java index 335c186cb..5c266c307 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java @@ -23,12 +23,12 @@ import java.io.IOException; import java.util.*; import java.util.zip.*; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.util.ZLInputStreamWithOffset; import org.geometerplus.zlibrary.core.image.*; import org.geometerplus.zlibrary.text.model.*; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.fbreader.formats.pdb.*; diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java index e1dffb98d..47962d0c5 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java @@ -19,11 +19,11 @@ package org.geometerplus.fbreader.formats.xhtml; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.image.ZLFileImage; import org.geometerplus.zlibrary.core.filesystem.ZLFile; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.formats.util.MiscUtil; import org.geometerplus.fbreader.bookmodel.BookReader; diff --git a/src/org/geometerplus/fbreader/network/Base64EncodedImage.java b/src/org/geometerplus/fbreader/network/Base64EncodedImage.java index 2088795b4..be997d21e 100644 --- a/src/org/geometerplus/fbreader/network/Base64EncodedImage.java +++ b/src/org/geometerplus/fbreader/network/Base64EncodedImage.java @@ -21,9 +21,9 @@ package org.geometerplus.fbreader.network; import java.io.*; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.image.ZLBase64EncodedImage; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.Paths; final class Base64EncodedImage extends ZLBase64EncodedImage { diff --git a/src/org/geometerplus/fbreader/network/NetworkImage.java b/src/org/geometerplus/fbreader/network/NetworkImage.java index 5ae0d5b16..f268ff512 100644 --- a/src/org/geometerplus/fbreader/network/NetworkImage.java +++ b/src/org/geometerplus/fbreader/network/NetworkImage.java @@ -22,11 +22,11 @@ package org.geometerplus.fbreader.network; import java.io.*; import java.net.*; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.image.ZLLoadableImage; import org.geometerplus.zlibrary.core.network.ZLNetworkManager; import org.geometerplus.zlibrary.core.network.ZLNetworkException; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.Paths; public final class NetworkImage extends ZLLoadableImage implements MimeTypes { @@ -133,10 +133,17 @@ public final class NetworkImage extends ZLLoadableImage implements MimeTypes { return makeImageFileName(Url, mimeType()); } + @Override + public String getId() { + return Url; + } + + @Override public void synchronize() { synchronizeInternal(false); } + @Override public void synchronizeFast() { synchronizeInternal(true); } diff --git a/src/org/geometerplus/fbreader/network/NetworkTree.java b/src/org/geometerplus/fbreader/network/NetworkTree.java index 2dfa6320b..cec67ff39 100644 --- a/src/org/geometerplus/fbreader/network/NetworkTree.java +++ b/src/org/geometerplus/fbreader/network/NetworkTree.java @@ -22,10 +22,10 @@ package org.geometerplus.fbreader.network; import java.util.LinkedList; import java.util.Set; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.fbreader.tree.FBTree; -import org.geometerplus.fbreader.constants.MimeTypes; public abstract class NetworkTree extends FBTree { protected NetworkTree(int level) { diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java index 31ee71872..1f7f3f6f8 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java @@ -21,6 +21,7 @@ package org.geometerplus.fbreader.network.authentication.litres; import java.util.*; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.fbreader.network.*; @@ -157,7 +158,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { } else if (TAG_BOOK_TITLE == tag) { myState = BOOK_TITLE; } else if (TAG_ANNOTATION == tag) { - myHtmlToString.setupTextContent("text/xhtml"); + myHtmlToString.setupTextContent(MimeTypes.MIME_TEXT_XHTML); myState = ANNOTATION; } else if (TAG_DATE == tag) { myState = DATE; diff --git a/src/org/geometerplus/fbreader/network/opds/CatalogInfoReader.java b/src/org/geometerplus/fbreader/network/opds/CatalogInfoReader.java index 1a3c498f9..c58fb2468 100644 --- a/src/org/geometerplus/fbreader/network/opds/CatalogInfoReader.java +++ b/src/org/geometerplus/fbreader/network/opds/CatalogInfoReader.java @@ -21,9 +21,9 @@ package org.geometerplus.fbreader.network.opds; import java.util.List; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; -import org.geometerplus.fbreader.constants.MimeTypes; import org.geometerplus.fbreader.network.atom.ATOMLink; class CatalogInfoReader implements OPDSFeedReader { diff --git a/src/org/geometerplus/fbreader/network/opds/HtmlToString.java b/src/org/geometerplus/fbreader/network/opds/HtmlToString.java index 0a338b9d7..3d9be306b 100644 --- a/src/org/geometerplus/fbreader/network/opds/HtmlToString.java +++ b/src/org/geometerplus/fbreader/network/opds/HtmlToString.java @@ -24,16 +24,14 @@ import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; import org.geometerplus.zlibrary.core.html.*; - +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; import org.geometerplus.zlibrary.core.xml.ZLStringMap; -import org.geometerplus.fbreader.formats.xhtml.XHTMLReader; +import org.geometerplus.fbreader.formats.xhtml.XHTMLReader; import org.geometerplus.fbreader.network.atom.ATOMConstants; - public class HtmlToString { - private String myLastOpenedTag; private String myTextType; private StringBuilder myTextContent = new StringBuilder(); @@ -61,8 +59,8 @@ public class HtmlToString { result = new String(contentArray); } if (result != null) { - if (myTextType == ATOMConstants.TYPE_HTML || myTextType == ATOMConstants.TYPE_XHTML - || myTextType == "text/html" || myTextType == "text/xhtml") { + if (myTextType == ATOMConstants.TYPE_HTML || myTextType == ATOMConstants.TYPE_XHTML || + myTextType == MimeTypes.MIME_TEXT_HTML || myTextType == MimeTypes.MIME_TEXT_XHTML) { myHtmlToStringReader.readFromString(result); result = myHtmlToStringReader.getString(); } @@ -73,7 +71,7 @@ public class HtmlToString { } public void processTextContent(boolean closeTag, String tag, ZLStringMap attributes, String bufferContent) { - if (myTextType == ATOMConstants.TYPE_XHTML || myTextType == "text/xhtml") { + if (myTextType == ATOMConstants.TYPE_XHTML || myTextType == MimeTypes.MIME_TEXT_XHTML) { if (bufferContent != null) { myTextContent.append(bufferContent); } diff --git a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java index ed45c1227..f9b5dbd9a 100644 --- a/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java +++ b/src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java @@ -21,10 +21,9 @@ package org.geometerplus.fbreader.network.opds; import java.util.*; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; -import org.geometerplus.fbreader.constants.MimeTypes; - import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.atom.*; import org.geometerplus.fbreader.network.authentication.litres.LitResBookshelfItem; diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java index 185c629d8..55ee9be69 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java @@ -23,13 +23,12 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Map; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile; import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; import org.geometerplus.zlibrary.core.xml.ZLStringMap; -import org.geometerplus.fbreader.constants.XMLNamespaces; -import org.geometerplus.fbreader.constants.MimeTypes; - import org.geometerplus.fbreader.network.INetworkLink; import org.geometerplus.fbreader.network.NetworkLibrary; import org.geometerplus.fbreader.network.atom.ATOMLink; diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java index f309068d2..458b755bb 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java @@ -21,15 +21,12 @@ package org.geometerplus.fbreader.network.opds; import java.util.*; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; import org.geometerplus.zlibrary.core.xml.*; -import org.geometerplus.fbreader.constants.XMLNamespaces; - import org.geometerplus.fbreader.network.atom.*; - class OPDSXMLReader extends ZLXMLReaderAdapter { - public static final String KEY_PRICE = "price"; diff --git a/src/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java index 3f4837969..308b15e05 100644 --- a/src/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OpenSearchXMLReader.java @@ -23,13 +23,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.geometerplus.zlibrary.core.constants.XMLNamespaces; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.util.ZLNetworkUtil; import org.geometerplus.zlibrary.core.xml.ZLStringMap; import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; -import org.geometerplus.fbreader.constants.XMLNamespaces; -import org.geometerplus.fbreader.constants.MimeTypes; - class OpenSearchXMLReader extends ZLXMLReaderAdapter { private final List myDescriptions; diff --git a/src/org/geometerplus/zlibrary/core/constants/MimeTypes.java b/src/org/geometerplus/zlibrary/core/constants/MimeTypes.java index 74fa079da..518eef2dd 100644 --- a/src/org/geometerplus/zlibrary/core/constants/MimeTypes.java +++ b/src/org/geometerplus/zlibrary/core/constants/MimeTypes.java @@ -17,7 +17,7 @@ * 02110-1301, USA. */ -package org.geometerplus.fbreader.constants; +package org.geometerplus.zlibrary.core.constants; public interface MimeTypes { // MIME types / application @@ -35,6 +35,8 @@ public interface MimeTypes { // MIME types / text String MIME_TEXT_HTML = "text/html"; + String MIME_TEXT_XHTML = "text/xhtml"; + String MIME_TEXT_PLAIN = "text/plain"; // MIME images String MIME_IMAGE_PREFIX = "image/"; diff --git a/src/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java b/src/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java index 4680689a7..8c2708929 100644 --- a/src/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java +++ b/src/org/geometerplus/zlibrary/core/constants/XMLNamespaces.java @@ -17,7 +17,7 @@ * 02110-1301, USA. */ -package org.geometerplus.fbreader.constants; +package org.geometerplus.zlibrary.core.constants; public interface XMLNamespaces { String DublinCorePrefix = "http://purl.org/dc/elements"; diff --git a/src/org/geometerplus/zlibrary/core/image/ZLLoadableImage.java b/src/org/geometerplus/zlibrary/core/image/ZLLoadableImage.java index a97eddb32..132f44aac 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLLoadableImage.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLLoadableImage.java @@ -36,4 +36,5 @@ public abstract class ZLLoadableImage extends ZLSingleImage { public abstract void synchronize(); public abstract void synchronizeFast(); + public abstract String getId(); } diff --git a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java b/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java index 00f89aac7..06d31db5b 100644 --- a/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java +++ b/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java @@ -19,6 +19,7 @@ package org.geometerplus.zlibrary.ui.android.image; +import org.geometerplus.zlibrary.core.constants.MimeTypes; import org.geometerplus.zlibrary.core.image.*; public final class ZLAndroidImageManager extends ZLImageManager { @@ -27,7 +28,7 @@ public final class ZLAndroidImageManager extends ZLImageManager { return (ZLAndroidImageData)image; } else if (image instanceof ZLSingleImage) { ZLSingleImage singleImage = (ZLSingleImage)image; - if ("image/palm".equals(singleImage.mimeType())) { + if (MimeTypes.MIME_IMAGE_PALM.equals(singleImage.mimeType())) { return null; } byte[] array = singleImage.byteData();