From ada29a9eef7e32a1a0f6bb6c1c9ce6ff501eabfa Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 5 Oct 2013 23:54:05 +0100
Subject: [PATCH] RSSNetworkLink is predefined link, not custom one

---
 .../network/opds/OPDSLinkXMLReader.java       |  1 +
 .../fbreader/network/rss/RSSNetworkLink.java  | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
index e87a4ae38..4dc542f00 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
@@ -172,6 +172,7 @@ class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants {
 			} else if (MimeType.APP_RSS_XML.weakEquals(catalogInfo.Mime)) {
 				return new RSSNetworkLink(
 					OPDSNetworkLink.INVALID_ID,
+					id,
 					siteName,
 					titleString,
 					summaryString,
diff --git a/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java b/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
index 6ccf4db87..08861274b 100644
--- a/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/rss/RSSNetworkLink.java
@@ -33,13 +33,17 @@ import org.geometerplus.fbreader.network.urlInfo.*;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 import org.geometerplus.fbreader.network.tree.NetworkItemsLoader;
 
-public class RSSNetworkLink extends AbstractNetworkLink implements ICustomNetworkLink {
-	
+public class RSSNetworkLink extends AbstractNetworkLink implements IPredefinedNetworkLink {
+	private final String myPredefinedId;
 	private final Map<String,String> myExtraData = new HashMap<String,String>();
 	
-	public RSSNetworkLink(int id, String siteName, String title, String summary,
-			String language, UrlInfoCollection<UrlInfoWithDate> infos) {
+	public RSSNetworkLink(
+		int id, String predefinedId,
+		String siteName, String title, String summary,
+		String language, UrlInfoCollection<UrlInfoWithDate> infos
+	) {
 		super(id, siteName, title, summary, language, infos);
+		myPredefinedId = predefinedId;
 	}
 	
 	ZLNetworkRequest createNetworkData(String url, MimeType mime, final RSSCatalogItem.State result) {
@@ -87,20 +91,22 @@ public class RSSNetworkLink extends AbstractNetworkLink implements ICustomNetwor
 
 	@Override
 	public Type getType() {
-		// TODO Auto-generated method stub
-		return null;
+		return Type.Predefined;
+	}
+
+	@Override
+	public String getPredefinedId() {
+		return myPredefinedId;
 	}
 
 	@Override
 	public ZLNetworkRequest simpleSearchRequest(String pattern,
 			NetworkOperationData data) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public ZLNetworkRequest resume(NetworkOperationData data) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -122,7 +128,6 @@ public class RSSNetworkLink extends AbstractNetworkLink implements ICustomNetwor
 
 	@Override
 	public NetworkAuthenticationManager authenticationManager() {
-		// TODO Auto-generated method stub
 		return null;
 	}