From 6bc69fa290d728edcf87fac32e5de5551800a51c Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 8 May 2011 02:02:36 +0100 Subject: [PATCH] String => CharSequnce; better book annotation displaying --- .../fbreader/network/NetworkBookInfoActivity.java | 11 +++++++---- .../fbreader/network/NetworkBookItem.java | 2 +- .../network/NetworkBookItemComparator.java | 15 +++++++++------ .../fbreader/network/NetworkCatalogItem.java | 2 +- .../fbreader/network/NetworkItem.java | 12 ++++++------ .../fbreader/network/NetworkURLCatalogItem.java | 4 ++-- .../fbreader/network/atom/ATOMEntry.java | 6 +++--- .../fbreader/network/atom/ATOMFeedMetadata.java | 4 ++-- .../fbreader/network/atom/ATOMXMLReader.java | 4 ++-- .../fbreader/network/atom/HtmlToString.java | 4 ++-- .../litres/LitResBookshelfItem.java | 6 +++--- .../litres/LitResRecommendationsItem.java | 2 +- .../authentication/litres/LitResXMLReader.java | 5 +++-- .../fbreader/network/opds/OPDSBookItem.java | 4 ++-- .../network/opds/OPDSCatalogInfoHandler.java | 4 ++-- .../fbreader/network/opds/OPDSCatalogItem.java | 4 ++-- .../fbreader/network/opds/OPDSCustomLink.java | 4 ++-- .../fbreader/network/opds/OPDSFeedHandler.java | 6 +++--- .../fbreader/network/opds/OPDSLinkXMLReader.java | 15 +++++++++------ .../fbreader/network/tree/NetworkBookTree.java | 2 +- .../fbreader/network/tree/NetworkCatalogTree.java | 6 +++--- .../fbreader/network/tree/TopUpTree.java | 6 +++--- 22 files changed, 69 insertions(+), 59 deletions(-) diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index 24e443339..f3f607d0e 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -22,12 +22,13 @@ package org.geometerplus.android.fbreader.network; import java.util.*; import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; import android.os.Bundle; +import android.text.method.LinkMovementMethod; import android.util.DisplayMetrics; import android.view.*; import android.widget.*; -import android.content.Intent; -import android.graphics.Bitmap; import org.geometerplus.zlibrary.ui.android.R; @@ -139,11 +140,13 @@ public class NetworkBookInfoActivity extends Activity implements NetworkView.Eve private final void setupDescription() { setTextFromResource(R.id.network_book_description_title, "description"); - String description = myBook.getSummary(); + CharSequence description = myBook.getSummary(); if (description == null) { description = myResource.getResource("noDescription").getValue(); } - setTextById(R.id.network_book_description, description); + final TextView descriptionView = (TextView)findViewById(R.id.network_book_description); + descriptionView.setText(description); + descriptionView.setMovementMethod(new LinkMovementMethod()); } private final void setupExtraLinks() { diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItem.java b/src/org/geometerplus/fbreader/network/NetworkBookItem.java index ee2879b19..0fdd31f8f 100644 --- a/src/org/geometerplus/fbreader/network/NetworkBookItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkBookItem.java @@ -95,7 +95,7 @@ public class NetworkBookItem extends NetworkItem { * @param urls list of urls related to this book. Can be null. */ public NetworkBookItem(INetworkLink link, String id, int index, - String title, String summary, /*String language, String date,*/ + CharSequence title, CharSequence summary, /*String language, String date,*/ List authors, List tags, String seriesTitle, float indexInSeries, UrlInfoCollection urls) { super(link, title, summary, urls); diff --git a/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java b/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java index e5d314e3a..581fb0d1b 100644 --- a/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java +++ b/src/org/geometerplus/fbreader/network/NetworkBookItemComparator.java @@ -27,15 +27,18 @@ public final class NetworkBookItemComparator implements Comparator final boolean item0isABook = item0 instanceof NetworkBookItem; final boolean item1isABook = item1 instanceof NetworkBookItem; + final String title0 = item0.Title.toString(); + final String title1 = item1.Title.toString(); + if (!item0isABook && !item1isABook) { - return item0.Title.compareTo(item1.Title); + return title0.compareTo(title1); } if (!item0isABook || !item1isABook) { return item0isABook ? 1 : -1; } - final NetworkBookItem book0 = (NetworkBookItem) item0; - final NetworkBookItem book1 = (NetworkBookItem) item1; + final NetworkBookItem book0 = (NetworkBookItem)item0; + final NetworkBookItem book1 = (NetworkBookItem)item1; final LinkedList authors0 = book0.Authors; final LinkedList authors1 = book1.Authors; @@ -73,11 +76,11 @@ public final class NetworkBookItemComparator implements Comparator return diff > 0 ? 1 : -1; } } - return book0.Title.compareTo(book1.Title); + return title0.compareTo(title1); } - final String book0Key = book0HasSeriesTitle ? book0.SeriesTitle : book0.Title; - final String book1Key = book1HasSeriesTitle ? book1.SeriesTitle : book1.Title; + final String book0Key = book0HasSeriesTitle ? book0.SeriesTitle : title0; + final String book1Key = book1HasSeriesTitle ? book1.SeriesTitle : title1; final int comp = book0Key.compareTo(book1Key); if (comp != 0) { return comp; diff --git a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java index a071f22bb..e1a488c16 100644 --- a/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkCatalogItem.java @@ -64,7 +64,7 @@ public abstract class NetworkCatalogItem extends NetworkItem { * in the network library view. * @param flags describes how to show book items inside this catalog */ - public NetworkCatalogItem(INetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { + public NetworkCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { super(link, title, summary, urls); myAccessibility = accessibility; Flags = flags; diff --git a/src/org/geometerplus/fbreader/network/NetworkItem.java b/src/org/geometerplus/fbreader/network/NetworkItem.java index 7feaadba4..3f427fe1b 100644 --- a/src/org/geometerplus/fbreader/network/NetworkItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkItem.java @@ -26,9 +26,9 @@ import org.geometerplus.fbreader.network.urlInfo.UrlInfoCollection; public abstract class NetworkItem { public final INetworkLink Link; - public final String Title; + public final CharSequence Title; - private String mySummary; + private CharSequence mySummary; private final UrlInfoCollection myURLs; /** @@ -39,9 +39,9 @@ public abstract class NetworkItem { * @param summary description of this library item. Can be null. * @param urls collection of item-related urls (like icon link, opds catalog link, etc. Can be null. */ - protected NetworkItem(INetworkLink link, String title, String summary, UrlInfoCollection urls) { + protected NetworkItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls) { Link = link; - Title = title; + Title = title != null ? title : ""; setSummary(summary); if (urls != null && !urls.isEmpty()) { myURLs = new UrlInfoCollection(urls); @@ -50,11 +50,11 @@ public abstract class NetworkItem { } } - protected void setSummary(String summary) { + protected void setSummary(CharSequence summary) { mySummary = summary; } - public final String getSummary() { + public final CharSequence getSummary() { return mySummary; } diff --git a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java b/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java index 4dfe2f5cf..36f0b57e7 100644 --- a/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/NetworkURLCatalogItem.java @@ -35,7 +35,7 @@ public abstract class NetworkURLCatalogItem extends NetworkCatalogItem { * @param summary description of this library item. Can be null. * @param urls collection of item-related URLs. Can be null. */ - public NetworkURLCatalogItem(INetworkLink link, String title, String summary, UrlInfoCollection urls) { + public NetworkURLCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls) { this(link, title, summary, urls, Accessibility.ALWAYS, FLAGS_DEFAULT); } @@ -50,7 +50,7 @@ public abstract class NetworkURLCatalogItem extends NetworkCatalogItem { * in the network library view. * @param flags value defines how to show book items in this catalog. */ - public NetworkURLCatalogItem(INetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { + public NetworkURLCatalogItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { super(link, title, summary, urls, accessibility, flags); } diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMEntry.java b/src/org/geometerplus/fbreader/network/atom/ATOMEntry.java index 71e07e732..c760025c3 100644 --- a/src/org/geometerplus/fbreader/network/atom/ATOMEntry.java +++ b/src/org/geometerplus/fbreader/network/atom/ATOMEntry.java @@ -33,9 +33,9 @@ public class ATOMEntry extends ATOMCommonAttributes { public ATOMPublished Published; //public String Rights; // TODO: implement ATOMTextConstruct //public final ATOMSource Source; // TODO: implement ATOMSource - public String Summary; // TODO: implement ATOMTextConstruct - public String Content; // TODO: implement ATOMContent - public String Title; // TODO: implement ATOMTextConstruct + public CharSequence Summary; // TODO: implement ATOMTextConstruct + public CharSequence Content; // TODO: implement ATOMContent + public CharSequence Title; // TODO: implement ATOMTextConstruct public ATOMUpdated Updated; protected ATOMEntry(ZLStringMap source) { diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java b/src/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java index 256305de7..2085298ee 100644 --- a/src/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java +++ b/src/org/geometerplus/fbreader/network/atom/ATOMFeedMetadata.java @@ -34,8 +34,8 @@ public class ATOMFeedMetadata extends ATOMCommonAttributes { public LinkedList Links = new LinkedList(); //public ATOMLogo Logo; //public String Rights; // TODO: implement ATOMTextConstruct - public String Subtitle; // TODO: implement ATOMTextConstruct - public String Title; // TODO: implement ATOMTextConstruct + public CharSequence Subtitle; // TODO: implement ATOMTextConstruct + public CharSequence Title; // TODO: implement ATOMTextConstruct public ATOMUpdated Updated; protected ATOMFeedMetadata(ZLStringMap source) { diff --git a/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java b/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java index d79c93f82..a8e91397d 100644 --- a/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java +++ b/src/org/geometerplus/fbreader/network/atom/ATOMXMLReader.java @@ -379,7 +379,7 @@ public class ATOMXMLReader extends ZLXMLReaderAdapter { myHtmlToString.appendText(bufferContent); if (ns == XMLNamespaces.Atom && tag == TAG_TITLE) { // TODO:implement ATOMTextConstruct & ATOMTitle - final String title = myHtmlToString.getText(); + final CharSequence title = myHtmlToString.getText(); if (myFeed != null) { myFeed.Title = title; } @@ -392,7 +392,7 @@ public class ATOMXMLReader extends ZLXMLReaderAdapter { myHtmlToString.appendText(bufferContent); if (ns == XMLNamespaces.Atom && tag == TAG_SUBTITLE) { // TODO:implement ATOMTextConstruct & ATOMSubtitle - final String subtitle = myHtmlToString.getText(); + final CharSequence subtitle = myHtmlToString.getText(); if (myFeed != null) { myFeed.Subtitle = subtitle; } diff --git a/src/org/geometerplus/fbreader/network/atom/HtmlToString.java b/src/org/geometerplus/fbreader/network/atom/HtmlToString.java index e4ffc50cc..4ca2b3769 100644 --- a/src/org/geometerplus/fbreader/network/atom/HtmlToString.java +++ b/src/org/geometerplus/fbreader/network/atom/HtmlToString.java @@ -54,14 +54,14 @@ public class HtmlToString { } } - public String getText() { + public CharSequence getText() { final String text = myBuffer.toString(); myBuffer.delete(0, myBuffer.length()); switch (myType) { case Html: case XHtml: - return Html.fromHtml(text).toString(); + return Html.fromHtml(text); default: return text; } diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java index 3cfcdde15..7af1f3208 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java @@ -94,7 +94,7 @@ class ByTitleCatalogItem extends SortedCatalogItem { protected Comparator getComparator() { return new Comparator() { public int compare(NetworkItem item0, NetworkItem item1) { - return item0.Title.compareTo(item1.Title); + return item0.Title.toString().compareTo(item1.Title.toString()); } }; } @@ -140,7 +140,7 @@ class BySeriesCatalogItem extends SortedCatalogItem { if (fdiff != 0) { return fdiff > 0 ? 1 : -1; } - return book0.Title.compareTo(book1.Title); + return book0.Title.toString().compareTo(book1.Title.toString()); } }; } @@ -161,7 +161,7 @@ class BySeriesCatalogItem extends SortedCatalogItem { public class LitResBookshelfItem extends NetworkURLCatalogItem { private boolean myForceReload; - public LitResBookshelfItem(INetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) { + public LitResBookshelfItem(INetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility) { super(link, title, summary, urls, accessibility, FLAGS_DEFAULT); } diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java index 20788fbdd..90d365d9e 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResRecommendationsItem.java @@ -27,7 +27,7 @@ import org.geometerplus.fbreader.network.opds.OPDSNetworkLink; import org.geometerplus.fbreader.network.urlInfo.*; public class LitResRecommendationsItem extends OPDSCatalogItem { - public LitResRecommendationsItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility) { + public LitResRecommendationsItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility) { super(link, title, summary, urls, accessibility, FLAGS_DEFAULT & ~FLAGS_GROUP); } diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java index 9b7991b85..b0bbff2fa 100644 --- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java +++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java @@ -41,7 +41,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { private String mySeriesTitle; private int myIndexInSeries; - private String mySummary; + private CharSequence mySummary; private final UrlInfoCollection myUrls = new UrlInfoCollection(); @@ -228,7 +228,8 @@ class LitResXMLReader extends LitResAuthenticationXMLReader { myUrls )); - myBookId = myTitle = /*myLanguage = myDate = */mySeriesTitle = mySummary = null; + myBookId = myTitle = /*myLanguage = myDate = */mySeriesTitle = null; + mySummary = null; myIndexInSeries = 0; myAuthors.clear(); myTags.clear(); diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java b/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java index 3df9bf6ab..07ba738f5 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java @@ -31,7 +31,7 @@ import org.geometerplus.fbreader.network.atom.*; import org.geometerplus.fbreader.network.urlInfo.*; public class OPDSBookItem extends NetworkBookItem implements OPDSConstants { - private static String getAnnotation(OPDSEntry entry) { + private static CharSequence getAnnotation(OPDSEntry entry) { if (entry.Content != null) { return entry.Content; } @@ -259,7 +259,7 @@ public class OPDSBookItem extends NetworkBookItem implements OPDSConstants { public boolean processFeedEntry(OPDSEntry entry) { addUrls(getUrls((OPDSNetworkLink)Link, entry, myUrl)); - final String summary = getAnnotation(entry); + final CharSequence summary = getAnnotation(entry); if (summary != null) { setSummary(summary); } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java index 7796f548d..403811a5d 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogInfoHandler.java @@ -30,8 +30,8 @@ import org.geometerplus.fbreader.network.atom.ATOMFeedHandler; class OPDSCatalogInfoHandler implements ATOMFeedHandler { public boolean FeedStarted; public String Icon; - public String Title; - public String Summary; + public CharSequence Title; + public CharSequence Summary; public OpenSearchDescription DirectOpenSearchDescription; private final List myOpensearchDescriptionURLs; diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java index e76570bd4..ace6aeef4 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSCatalogItem.java @@ -39,12 +39,12 @@ public class OPDSCatalogItem extends NetworkURLCatalogItem { private State myLoadingState; private final Map myExtraData; - OPDSCatalogItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Map extraData) { + OPDSCatalogItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Map extraData) { super(link, title, summary, urls); myExtraData = extraData; } - protected OPDSCatalogItem(OPDSNetworkLink link, String title, String summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { + protected OPDSCatalogItem(OPDSNetworkLink link, CharSequence title, CharSequence summary, UrlInfoCollection urls, Accessibility accessibility, int flags) { super(link, title, summary, urls, accessibility, flags); myExtraData = null; } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java index 970284ded..621f2ee7c 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java @@ -130,8 +130,8 @@ public class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLin descriptions.add(info.DirectOpenSearchDescription); } if (!urlsOnly) { - myTitle = info.Title; - mySummary = info.Summary; + myTitle = info.Title.toString(); + mySummary = info.Summary != null ? info.Summary.toString() : null; } } }); diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java b/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java index 2d486dec8..6e9b20d7e 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java @@ -242,11 +242,11 @@ class OPDSFeedHandler implements ATOMFeedHandler, OP urlMap.removeAllInfos(UrlInfo.Type.HtmlPage); } - final String annotation; + final CharSequence annotation; if (entry.Summary != null) { - annotation = entry.Summary.replace("\n", ""); + annotation = entry.Summary; } else if (entry.Content != null) { - annotation = entry.Content.replace("\n", ""); + annotation = entry.Content; } else { annotation = null; } diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java index 83401712b..929c13bd3 100644 --- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java +++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java @@ -92,8 +92,8 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants { return false; } final String siteName = id.substring(ENTRY_ID_PREFIX.length()); - final String title = entry.Title; - final String summary = entry.Content; + final CharSequence title = entry.Title; + final CharSequence summary = entry.Content; final String language = entry.DCLanguage; final UrlInfoCollection infos = @@ -160,8 +160,8 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants { private INetworkLink link( String siteName, - String title, - String summary, + CharSequence title, + CharSequence summary, String language, UrlInfoCollection infos, HashMap urlConditions, @@ -171,10 +171,13 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants { return null; } + final String titleString = title.toString(); + final String summaryString = summary != null ? summary.toString() : null; + OPDSNetworkLink opdsLink = new OPDSNetworkLink( siteName, - title, - summary, + titleString, + summaryString, language, infos, myHasStableIdentifiers diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java index 5b3586547..6157e781d 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java @@ -44,7 +44,7 @@ public class NetworkBookTree extends NetworkTree { @Override public String getName() { - return Book.Title; + return Book.Title.toString(); } @Override diff --git a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java index d5d09e33c..20ba5b6ab 100644 --- a/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java +++ b/src/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java @@ -44,13 +44,13 @@ public class NetworkCatalogTree extends NetworkTree { @Override public String getName() { - return Item.Title; + return Item.Title.toString(); } @Override public String getSummary() { - final String summary = Item.getSummary(); - return summary != null ? summary : ""; + final CharSequence summary = Item.getSummary(); + return summary != null ? summary.toString() : ""; } @Override diff --git a/src/org/geometerplus/fbreader/network/tree/TopUpTree.java b/src/org/geometerplus/fbreader/network/tree/TopUpTree.java index 9bb570ad3..6f21eaa62 100644 --- a/src/org/geometerplus/fbreader/network/tree/TopUpTree.java +++ b/src/org/geometerplus/fbreader/network/tree/TopUpTree.java @@ -36,7 +36,7 @@ public class TopUpTree extends NetworkTree { @Override public String getName() { - return Item.Title; + return Item.Title.toString(); } @Override @@ -45,9 +45,9 @@ public class TopUpTree extends NetworkTree { try { if (mgr.isAuthorised(false)) { final String account = mgr.currentAccount(); - final String summary = Item.getSummary(); + final CharSequence summary = Item.getSummary(); if (account != null && summary != null) { - return summary.replace("%s", account); + return summary.toString().replace("%s", account); } } } catch (ZLNetworkException e) {