fixed custom catalog search

src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java

@@ -19,6 +19,8 @@
 
 package org.geometerplus.android.fbreader.network;
 
+import java.util.HashMap;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -35,15 +37,14 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.zlibrary.ui.android.R;
 
-import org.geometerplus.fbreader.network.ICustomNetworkLink;
+import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
 
 import org.geometerplus.android.util.UIUtil;
 
 public class AddCustomCatalogActivity extends Activity {
 	private ZLResource myResource;
-	private Integer myCatalogId;
+	private volatile ICustomNetworkLink myLink;
-	private String myIcon;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -83,21 +84,16 @@ public class AddCustomCatalogActivity extends Activity {
 		);
 
 		final Intent intent = getIntent();
+		myLink = NetworkLibraryActivity.getLinkFromIntent(intent);
 		final Uri uri = intent.getData();
-		myCatalogId = ICustomNetworkLink.INVALID_ID;
+
-		if (uri != null) {
+		if (myLink != null) {
-			myCatalogId = intent.getIntExtra(
+			setTextById(R.id.add_custom_catalog_url, myLink.getUrlInfo(INetworkLink.URL_MAIN).URL);
-				NetworkLibraryActivity.ADD_CATALOG_ID_KEY, myCatalogId
+			setTextById(R.id.add_custom_catalog_title, myLink.getTitle());
-			);
+			setTextById(R.id.add_custom_catalog_summary, myLink.getSummary());
-			if (myCatalogId != ICustomNetworkLink.INVALID_ID) {
-				setTextById(R.id.add_custom_catalog_url, uri.toString());
-				setTextById(R.id.add_custom_catalog_title, intent.getStringExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY));
-				setTextById(R.id.add_custom_catalog_summary, intent.getStringExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY));
-				myIcon = intent.getStringExtra(NetworkLibraryActivity.ADD_CATALOG_ICON_KEY);
-			} else {
-				loadInfoByUri(uri);
-			}
 			setExtraFieldsVisibility(true);
+		} else if (uri != null) {
+			loadInfoByUri(uri);
 		} else {
 			setExtraFieldsVisibility(false);
 		}
@@ -126,24 +122,22 @@ public class AddCustomCatalogActivity extends Activity {
 			setErrorByKey("invalidUrl");
 			return;
 		}
-		if (!getExtraFieldsVisibility()) {
+		if (myLink == null) {
 			loadInfoByUri(uri);
 		} else if (isEmptyString(title)) {
 			setErrorByKey("titleIsEmpty");
 		} else {
-			startActivity(
+			myLink.setTitle(title);
-				new Intent(
+			myLink.setSummary(summary);
-					NetworkLibraryActivity.ADD_CATALOG,
+
-					uri,
+			Intent intent = new Intent(
-					AddCustomCatalogActivity.this,
+				NetworkLibraryActivity.ADD_CATALOG,
-					NetworkLibraryActivity.class
+				uri,
-				)
+				AddCustomCatalogActivity.this,
-					.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, title)
+				NetworkLibraryActivity.class
-					.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, summary)
+			).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-					.putExtra(NetworkLibraryActivity.ADD_CATALOG_ICON_KEY, myIcon)
+			NetworkLibraryActivity.addLinkToIntent(intent, myLink);
-					.putExtra(NetworkLibraryActivity.ADD_CATALOG_ID_KEY, myCatalogId)
+			startActivity(intent);
-					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
-			);
 			finish();
 		}
 	}
@@ -152,10 +146,6 @@ public class AddCustomCatalogActivity extends Activity {
 		return s == null || s.length() == 0;
 	}
 
-	private boolean getExtraFieldsVisibility() {
-		return findViewById(R.id.add_custom_catalog_title_group).getVisibility() == View.VISIBLE;
-	}
-
 	private void setExtraFieldsVisibility(boolean show) {
 		final int visibility = show ? View.VISIBLE : View.GONE;
 		runOnUiThread(new Runnable() {
@@ -253,8 +243,11 @@ public class AddCustomCatalogActivity extends Activity {
 		if (siteName.startsWith("www.")) {
 			siteName = siteName.substring(4);
 		}
-		final ICustomNetworkLink link =
+		final HashMap<String,UrlInfo> infos = new HashMap<String,UrlInfo>();
-			OPDSLinkReader.createCustomLink(siteName, null, null, null, textUrl);
+		infos.put(INetworkLink.URL_MAIN, new UrlInfo(textUrl));
+		myLink = OPDSLinkReader.createCustomLink(
+			ICustomNetworkLink.INVALID_ID, siteName, null, null, null, infos
+		);
 
 		final Runnable loadInfoRunnable = new Runnable() {
 			private String myError;
@@ -262,20 +255,19 @@ public class AddCustomCatalogActivity extends Activity {
 			public void run() {
 				try {
 					myError = null;
-					link.reloadInfo();
+					myLink.reloadInfo();
 				} catch (ZLNetworkException e) {
 					myError = e.getMessage();
 				}
 				runOnUiThread(new Runnable() {
 					public void run() {
 						if (myError == null) {
-							setTextById(R.id.add_custom_catalog_title, link.getTitle());
+							setTextById(R.id.add_custom_catalog_title, myLink.getTitle());
-							setTextById(R.id.add_custom_catalog_summary, link.getSummary());
+							setTextById(R.id.add_custom_catalog_summary, myLink.getSummary());
-							myIcon = link.getIcon();
 							setExtraFieldsVisibility(true);
 						} else {
 							runErrorDialog(myError);
-							myIcon = null;
+							myLink = null;
 						}
 					}
 				});

src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java

@@ -248,19 +248,12 @@ class NetworkCatalogActions extends NetworkTreeActions {
 				return true;
 			case CUSTOM_CATALOG_EDIT:
 			{
-				final ICustomNetworkLink link =
+				final Intent intent = new Intent(activity, AddCustomCatalogActivity.class);
-					(ICustomNetworkLink)((NetworkCatalogTree)tree).Item.Link;
+				NetworkLibraryActivity.addLinkToIntent(
-				final String textUrl = link.getUrlInfo(INetworkLink.URL_MAIN).URL;
+					intent,
-				if (textUrl != null) {
+					(ICustomNetworkLink)((NetworkCatalogTree)tree).Item.Link
-					activity.startActivity(
+				);
-						new Intent(activity, AddCustomCatalogActivity.class)
+				activity.startActivity(intent);
-							.setData(Uri.parse(textUrl))
-							.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, link.getTitle())
-							.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, link.getSummary())
-							.putExtra(NetworkLibraryActivity.ADD_CATALOG_ICON_KEY, link.getIcon())
-							.putExtra(NetworkLibraryActivity.ADD_CATALOG_ID_KEY, link.getId())
-					);
-				}
 				return true;
 			}
 			case CUSTOM_CATALOG_REMOVE:

src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java

@@ -39,19 +39,43 @@ import org.geometerplus.zlibrary.ui.android.R;
 
 import org.geometerplus.android.util.UIUtil;
 
-import org.geometerplus.fbreader.network.NetworkTree;
+import org.geometerplus.fbreader.network.*;
-import org.geometerplus.fbreader.network.NetworkLibrary;
-import org.geometerplus.fbreader.network.ICustomNetworkLink;
 import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
 
 public class NetworkLibraryActivity extends NetworkBaseActivity {
-	final static String ADD_CATALOG = "android.fbreader.action.ADD_CATALOG";
+	static final String ADD_CATALOG = "android.fbreader.action.ADD_CATALOG";
 
-	final static String ADD_CATALOG_TITLE_KEY = "title";
+	private static final String ADD_CATALOG_TITLE_KEY = "title";
-	final static String ADD_CATALOG_SUMMARY_KEY = "summary";
+	private static final String ADD_CATALOG_SUMMARY_KEY = "summary";
-	final static String ADD_CATALOG_ICON_KEY = "icon";
+	private static final String ADD_CATALOG_ICON_KEY = "icon";
-	final static String ADD_CATALOG_ID_KEY = "id";
+	private static final String ADD_CATALOG_ID_KEY = "id";
-	final static String ADD_CATALOG_URLS_BUNDLE_KEY = "urls";
+	private static final String ADD_CATALOG_URLS_MAP_KEY = "urls";
+
+	static void addLinkToIntent(Intent intent, ICustomNetworkLink link) {
+		final String textUrl = link.getUrlInfo(INetworkLink.URL_MAIN).URL;
+		intent.setData(Uri.parse(textUrl));
+		intent
+			.putExtra(ADD_CATALOG_TITLE_KEY, link.getTitle())
+			.putExtra(ADD_CATALOG_SUMMARY_KEY, link.getSummary())
+			.putExtra(ADD_CATALOG_ICON_KEY, link.getIcon())
+			.putExtra(ADD_CATALOG_ID_KEY, link.getId())
+			.putExtra(ADD_CATALOG_URLS_MAP_KEY, link.urlInfoMap());
+	}
+
+	static ICustomNetworkLink getLinkFromIntent(Intent intent) {
+		final Uri uri = intent.getData();
+		if (uri == null || !intent.hasExtra(ADD_CATALOG_ID_KEY)) {
+			return null;
+		}
+		return OPDSLinkReader.createCustomLink(
+			intent.getIntExtra(ADD_CATALOG_ID_KEY, ICustomNetworkLink.INVALID_ID),
+			uri.getHost(),
+			intent.getStringExtra(ADD_CATALOG_TITLE_KEY),
+			intent.getStringExtra(ADD_CATALOG_SUMMARY_KEY),
+			intent.getStringExtra(ADD_CATALOG_ICON_KEY),
+			(HashMap<String,UrlInfo>)intent.getSerializableExtra(ADD_CATALOG_URLS_MAP_KEY)
+		);
+	}
 
 	private NetworkTree myTree;
 	private volatile Intent myIntent;
@@ -74,19 +98,9 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 	}
 
 	private void processIntent(Intent intent) {
-		final String action = intent.getAction();
+		if (ADD_CATALOG.equals(intent.getAction())) {
-		if (ADD_CATALOG.equals(action)) {
+			final ICustomNetworkLink link = getLinkFromIntent(intent);
-			final Uri uri = intent.getData();
+			System.err.println("LINK = " + link);
-			final String title = intent.getStringExtra(ADD_CATALOG_TITLE_KEY);
-			final String summary = intent.getStringExtra(ADD_CATALOG_SUMMARY_KEY);
-			final String icon = intent.getStringExtra(ADD_CATALOG_ICON_KEY);
-			final int id = intent.getIntExtra(ADD_CATALOG_ID_KEY, ICustomNetworkLink.INVALID_ID);
-			if (uri == null || title == null) {
-				return;
-			}
-			final ICustomNetworkLink link = OPDSLinkReader.createCustomLink(
-				id, uri.getHost(), title, summary, icon, uri.toString()
-			);
 			if (link != null) {
 				runOnUiThread(new Runnable() {
 					public void run() {

src/org/geometerplus/fbreader/network/AbstractNetworkLink.java

@@ -90,10 +90,12 @@ public abstract class AbstractNetworkLink implements INetworkLink {
 	@Override
 	public String toString() {
 		String icon = myIcon;
-		if (icon.length() > 64) {
+		if (icon != null) {
-			icon = icon.substring(0, 61) + "...";
+			if (icon.length() > 64) {
+				icon = icon.substring(0, 61) + "...";
+			}
+			icon = icon.replaceAll("\n", "");
 		}
-		icon = icon.replaceAll("\n", "");
 		return "AbstractNetworkLink: {"
 			+ "siteName=" + mySiteName
 			+ "; title=" + myTitle

src/org/geometerplus/fbreader/network/ICustomNetworkLink.java

@@ -21,6 +21,8 @@ package org.geometerplus.fbreader.network;
 
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
+import java.util.HashMap;
+
 public interface ICustomNetworkLink extends INetworkLink {
 	public static final int INVALID_ID = -1;
 
@@ -32,6 +34,7 @@ public interface ICustomNetworkLink extends INetworkLink {
 	void setSummary(String summary);
 	void setIcon(String icon);
 
+	HashMap<String,UrlInfo> urlInfoMap();
 	void setUrl(String urlKey, String url);
 	void removeUrl(String urlKey);
 

src/org/geometerplus/fbreader/network/INetworkLink.java

@@ -40,7 +40,6 @@ public interface INetworkLink {
 	String getSummary();
 	String getIcon();
 
-	HashMap<String,UrlInfo> urlInfoMap();
 	UrlInfo getUrlInfo(String urlKey);
 	Set<String> getUrlKeys();
 

src/org/geometerplus/fbreader/network/NetworkLibrary.java

@@ -180,8 +180,12 @@ public class NetworkLibrary {
 				new NetworkDatabase.ICustomLinksHandler() {
 					public void handleCustomLinkData(int id, String siteName,
 							String title, String summary, String icon, Map<String,UrlInfo> infos) {
-						final ICustomNetworkLink link = OPDSLinkReader.createCustomLink(id, siteName, title, summary, icon, infos);
+						if (title != null &&
-						if (link != null) {
+							siteName != null &&
+							infos.get(INetworkLink.URL_MAIN) != null) {
+							final ICustomNetworkLink link = OPDSLinkReader.createCustomLink(
+								id, siteName, title, summary, icon, infos
+							);
 							addLinkInternal(link);
 						}
 					}

src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java

@@ -40,22 +40,9 @@ public class OPDSLinkReader {
 	static final String CATALOGS_URL = "http://data.fbreader.org/catalogs/generic-1.2.xml";
 
 	public static ICustomNetworkLink createCustomLink(int id, String siteName, String title, String summary, String icon, Map<String,UrlInfo> infos) {
-		if (siteName == null || title == null || infos.get(INetworkLink.URL_MAIN) == null) {
-			return null;
-		}
 		return new OPDSCustomLink(id, siteName, title, summary, icon, infos);
 	}
 
-	public static ICustomNetworkLink createCustomLink(int id, String siteName, String title, String summary, String icon, String url) {
-		final HashMap<String,UrlInfo> infos = new HashMap<String,UrlInfo>();
-		infos.put(INetworkLink.URL_MAIN, new UrlInfo(url));
-		return new OPDSCustomLink(id, siteName, title, summary, icon, infos);
-	}
-
-	public static ICustomNetworkLink createCustomLink(String siteName, String title, String summary, String icon, String url) {
-		return createCustomLink(ICustomNetworkLink.INVALID_ID, siteName, title, summary, icon, url);
-	}
-
 	public static final int CACHE_LOAD = 0;
 	public static final int CACHE_UPDATE = 1;
 	public static final int CACHE_CLEAR = 2;

src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java

@@ -127,6 +127,7 @@ public class OPDSNetworkLink extends AbstractNetworkLink {
 		if (url == null) {
 			return null;
 		}
+		System.err.println("URL = " + url);
 		try {
 			pattern = URLEncoder.encode(pattern, "utf-8");
 		} catch (UnsupportedEncodingException e) {