From fcfb34b24d1f13fbbca120137debddbbacaef96d Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Tue, 22 Feb 2011 11:23:08 +0000
Subject: [PATCH 01/13] new TODO item

---
 TODO.0.99.X | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TODO.0.99.X b/TODO.0.99.X
index 806a7b04c..a80fba2d9 100644
--- a/TODO.0.99.X
+++ b/TODO.0.99.X
@@ -2,3 +2,4 @@ DONE hyphenations are not changed after language changing in book info dialog
 * scrolling: 4 directions
 * scrolling: add 3D animation
 DONE 'disable douple tapping' option
+* float numbers as series index

From bc058dc5881cb5a355e50cc5df0ac43a820df5af Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Tue, 22 Feb 2011 11:48:06 +0000
Subject: [PATCH 02/13] cleanup

---
 src/org/geometerplus/android/fbreader/CancelActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/CancelActivity.java b/src/org/geometerplus/android/fbreader/CancelActivity.java
index b207e23a0..7582233c2 100644
--- a/src/org/geometerplus/android/fbreader/CancelActivity.java
+++ b/src/org/geometerplus/android/fbreader/CancelActivity.java
@@ -77,12 +77,12 @@ public class CancelActivity extends ListActivity {
 			if (summary != null) {
 				summaryView.setVisibility(View.VISIBLE);
 				summaryView.setText(summary);
-        		titleView.setLayoutParams(new LinearLayout.LayoutParams(
+				titleView.setLayoutParams(new LinearLayout.LayoutParams(
 					LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT
 				));
 			} else {
 				summaryView.setVisibility(View.GONE);
-        		titleView.setLayoutParams(new LinearLayout.LayoutParams(
+				titleView.setLayoutParams(new LinearLayout.LayoutParams(
 					LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.FILL_PARENT
 				));
 			}

From cd2f1954a71d9829f2bed9cb1e0aff474c410ae9 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Tue, 22 Feb 2011 11:50:54 +0000
Subject: [PATCH 03/13] cleanup

---
 src/org/geometerplus/android/fbreader/FBReader.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java
index c2300ecac..7fa5408e2 100644
--- a/src/org/geometerplus/android/fbreader/FBReader.java
+++ b/src/org/geometerplus/android/fbreader/FBReader.java
@@ -27,7 +27,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.view.Menu;
 import android.view.WindowManager;
-import android.view.Window;
 import android.widget.RelativeLayout;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;

From 2ebb3ad9d16a5efffbcf5088c4c64c6b3983c794 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Thu, 24 Feb 2011 04:38:20 +0300
Subject: [PATCH 04/13] new 'add custom dialog activity'; 'opds' scheme support
 in AndroidManifest.xml

---
 AndroidManifest.xml                           |  10 +-
 AndroidManifest.xml.pattern                   |  10 +-
 assets/resources/application/cs.xml           |   2 +-
 assets/resources/application/de.xml           |   2 +-
 assets/resources/application/en.xml           |   2 +-
 assets/resources/application/fr.xml           |   2 +-
 assets/resources/application/gl.xml           |   2 +-
 assets/resources/application/hu.xml           |   2 +-
 assets/resources/application/it.xml           |   2 +-
 assets/resources/application/nl.xml           |   2 +-
 assets/resources/application/ru.xml           |   2 +-
 assets/resources/application/th.xml           |   2 +-
 assets/resources/application/uk.xml           |   2 +-
 assets/resources/application/vi.xml           |   2 +-
 assets/resources/application/zh.xml           |   2 +-
 res/layout/add_custom_catalog.xml             | 164 ++++++++++++++++++
 .../network/AddCustomCatalogActivity.java     | 118 +++++++++++++
 17 files changed, 313 insertions(+), 15 deletions(-)
 create mode 100644 res/layout/add_custom_catalog.xml
 create mode 100644 src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c30317de6..b12bf99a1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -131,9 +131,17 @@
 			</intent-filter>
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
 		</activity>
-		<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden">
+		<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:configChanges="orientation|keyboardHidden">
 			<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity" />
 		</activity>
+		<activity android:name="org.geometerplus.android.fbreader.network.AddCustomCatalogActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:host="*" android:scheme="opds" />
+			</intent-filter>
+		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.network.NetworkCatalogActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden" />
 		<service android:name="org.geometerplus.android.fbreader.network.ItemsLoadingService" android:process=":networkLibrary" />
 		<activity android:name="org.geometerplus.android.fbreader.network.NetworkBookInfoActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden" />
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index b86275398..6d509e71d 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -131,9 +131,17 @@
 			</intent-filter>
 			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
 		</activity>
-		<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden">
+		<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:configChanges="orientation|keyboardHidden">
 			<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity" />
 		</activity>
+		<activity android:name="org.geometerplus.android.fbreader.network.AddCustomCatalogActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:host="*" android:scheme="opds" />
+			</intent-filter>
+		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.network.NetworkCatalogActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden" />
 		<service android:name="org.geometerplus.android.fbreader.network.ItemsLoadingService" android:process=":networkLibrary" />
 		<activity android:name="org.geometerplus.android.fbreader.network.NetworkBookInfoActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden" />
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index a3eba2f15..6d3cbdc4f 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Přihlásit" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Vlastní katalog" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Název" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Stručný obsah" />
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index a5f4ef6ae..397a6dd3c 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -577,7 +577,7 @@
 			<node name="register" value="Anmelden" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Benutzerspezifischer Katalog" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Titel" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Zusammenfassung" />
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index 883301de5..5762c68ed 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -575,7 +575,7 @@
 			<node name="register" value="Sign up" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Custom catalog" />
+			<node name="title" value="FBReader: add custom catalog" />
 			<node name="catalogTitle" value="Title" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Summary" />
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index f9bd3390f..278f4407a 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -579,7 +579,7 @@
 			<node name="register" value="Inscription"/>
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Catalogue personalisé" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Titre" />
 			<node name="catalogUrl" value="Adresse du catalogue sur le réseau" />
 			<node name="catalogSummary" value="Description" />
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index 9fabc7324..50cf6e658 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Rexistro" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Catálogo personalizado" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Título" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Resumo" />
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 9a514b903..aa740916b 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Regisztráció" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Saját katalógus" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Cím" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Leírás" />
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index 677225789..1ca86c6d2 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Registrati" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Catalogo personalizzato" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Titolo" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Sommario" />
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index 937e00481..584af5657 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Registeren" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Andere catalogus" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Titel" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Beschrijving" />
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index b6b34d4da..01f6c1d2c 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -575,7 +575,7 @@
 			<node name="register" value="Зарегистрироваться" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Пользовательский каталог" />
+			<node name="title" value="FBReader: добавление каталога" />
 			<node name="catalogTitle" value="Название" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Описание" />
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index bcb0e5941..f038f5afd 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="ลงทะเบียน"/>
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="แคตตาล็อกที่กำหนดเอง"/>
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="ชื่อแคตตาล็อก"/>
 			<node name="catalogUrl" value="URL"/>
 			<node name="catalogSummary" value="สรุป"/>
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index cd76fe5b3..a53479eaf 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Зареєструватися" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Користувацький каталог" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Назва" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Опис" />
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index c4ecfcbbf..32dd226e7 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="Đăng ký" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="Tùy chỉnh catalo" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="Tiêu đề" />
 			<node name="catalogUrl" value="URL" />
 			<node name="catalogSummary" value="Tóm tắt" />
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index 67be67fbd..dc3f88367 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -576,7 +576,7 @@
 			<node name="register" value="注册" />
 		</node>
 		<node name="CustomCatalogDialog">
-			<node name="title" value="自定义书库目录" />
+			<node name="title" value="FBReader: add custom catalog" toBeTranslated="true" />
 			<node name="catalogTitle" value="目录名称" />
 			<node name="catalogUrl" value="目录网址" />
 			<node name="catalogSummary" value="简介" />
diff --git a/res/layout/add_custom_catalog.xml b/res/layout/add_custom_catalog.xml
new file mode 100644
index 000000000..40823bcfa
--- /dev/null
+++ b/res/layout/add_custom_catalog.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+>
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"
+		android:orientation="vertical"
+	>
+		<RelativeLayout
+			android:id="@+id/add_custom_catalog_title_group"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+		>
+			<TextView
+				android:id="@+id/add_custom_catalog_title_label"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_alignParentTop="true"
+			/>
+			<TextView
+				android:id="@+id/add_custom_catalog_title_star"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="*"
+				android:textColor="#ffff0000"
+				android:layout_marginLeft="4dp"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/add_custom_catalog_title_label"
+			/>
+			<EditText
+				android:id="@+id/add_custom_catalog_title"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_alignParentLeft="true"
+				android:layout_toLeftOf="@id/add_custom_catalog_title_star"
+				android:layout_below="@id/add_custom_catalog_title_label"
+			/>
+			<TextView
+				android:id="@+id/add_custom_catalog_title_example"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:gravity="right"
+				android:layout_alignParentBottom="true"
+				android:layout_below="@id/add_custom_catalog_title"
+			/>
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:id="@+id/add_custom_catalog_url_group"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="5dp"
+		>
+			<TextView
+				android:id="@+id/add_custom_catalog_url_label"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_alignParentTop="true"
+			/>
+			<TextView
+				android:id="@+id/add_custom_catalog_url_star"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="*"
+				android:textColor="#ffff0000"
+				android:layout_marginLeft="4dp"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/add_custom_catalog_url_label"
+			/>
+			<EditText
+				android:id="@+id/add_custom_catalog_url"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:inputType="textUri"
+				android:layout_alignParentLeft="true"
+				android:layout_toLeftOf="@id/add_custom_catalog_url_star"
+				android:layout_below="@id/add_custom_catalog_url_label"
+			/>
+			<TextView
+				android:id="@+id/add_custom_catalog_url_example"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:gravity="right"
+				android:layout_alignParentBottom="true"
+				android:layout_below="@id/add_custom_catalog_url"
+			/>
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:id="@+id/add_custom_catalog_summary_group"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="5dp"
+		>
+			<TextView
+				android:id="@+id/add_custom_catalog_summary_label"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_alignParentTop="true"
+			/>
+			<EditText
+				android:id="@+id/add_custom_catalog_summary"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:layout_below="@id/add_custom_catalog_summary_label"
+			/>
+			<TextView
+				android:id="@+id/add_custom_catalog_summary_example"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:gravity="right"
+				android:layout_alignParentBottom="true"
+				android:layout_below="@id/add_custom_catalog_summary"
+			/>
+		</RelativeLayout>
+
+		<TextView
+			android:id="@+id/add_custom_catalog_error"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			android:textColor="#ff0000"
+			android:layout_marginTop="5dp"
+			android:layout_marginBottom="5dp"
+		/>
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:paddingTop="20dp"
+			android:paddingBottom="10dp"
+			android:orientation="horizontal"
+		>
+			<Button
+				android:id="@+id/add_custom_catalog_ok_button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="10dp"
+				android:layout_marginRight="10dp"
+				android:layout_weight="1"
+			/>
+			<Button
+				android:id="@+id/add_custom_catalog_cancel_button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="10dp"
+				android:layout_marginRight="10dp"
+				android:layout_weight="1"
+			/>
+		</LinearLayout>
+	</LinearLayout>
+</ScrollView>
diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
new file mode 100644
index 000000000..3112f38e3
--- /dev/null
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2010-2011 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.android.fbreader.network;
+
+import android.app.Activity;
+import android.net.Uri;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import org.geometerplus.zlibrary.core.resources.ZLResource;
+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.opds.OPDSLinkReader;
+
+import org.geometerplus.android.util.UIUtil;
+
+public class AddCustomCatalogActivity extends Activity {
+	private ZLResource myResource;
+
+	@Override
+	public void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+		Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this));
+		setContentView(R.layout.add_custom_catalog);
+
+		final ZLResource dialogResource = ZLResource.resource("dialog");
+		myResource = dialogResource.getResource("CustomCatalogDialog");
+
+		setTitle(myResource.getResource("title").getValue());
+
+		setTextFromResource(R.id.add_custom_catalog_title_label, "catalogTitle");
+		setTextFromResource(R.id.add_custom_catalog_url_label, "catalogUrl");
+		setTextFromResource(R.id.add_custom_catalog_summary_label, "catalogSummary");
+		setTextFromResource(R.id.add_custom_catalog_title_example, "catalogTitleExample");
+		setTextFromResource(R.id.add_custom_catalog_url_example, "catalogUrlExample");
+		setTextFromResource(R.id.add_custom_catalog_summary_example, "catalogSummaryExample");
+
+		final ZLResource buttonResource = dialogResource.getResource("button");
+		setText(R.id.add_custom_catalog_ok_button, buttonResource.getResource("ok").getValue());
+		setText(R.id.add_custom_catalog_cancel_button, buttonResource.getResource("cancel").getValue());
+
+		final Uri uri = getIntent().getData();
+		if (uri != null) {
+			loadInfoByUri(uri);
+		} 
+	}
+
+	private void setText(int id, String text) {
+		((TextView)findViewById(id)).setText(text);
+	}
+
+	private void setTextFromResource(int id, String resourceKey) {
+		setText(id, myResource.getResource(resourceKey).getValue());
+	}
+
+	private void loadInfoByUri(Uri uri) {
+		String httpUrl = uri.toString();
+		if (uri.getScheme() == null) {
+			httpUrl = "http://" + httpUrl;
+			uri = Uri.parse(httpUrl);
+		} else if ("opds".equals(uri.getScheme())) {
+			httpUrl = "http" + uri.toString().substring(4);
+		}
+
+		setText(R.id.add_custom_catalog_url, httpUrl);
+		String siteName = uri.getHost();
+		if (siteName == null) {
+			setTextFromResource(R.id.add_custom_catalog_error, "invalidUrl");
+			return;
+		}
+
+		if (siteName.startsWith("www.")) {
+			siteName = siteName.substring(4);
+		}
+		final ICustomNetworkLink link =
+		OPDSLinkReader.createCustomLinkWithoutInfo(siteName, httpUrl);
+
+		final Runnable loadInfoRunnable = new Runnable() {
+			private String myError;
+
+			public void run() {
+				try {
+					link.reloadInfo();
+				} catch (ZLNetworkException e) {
+					myError = e.getMessage();
+				}
+				runOnUiThread(new Runnable() {
+					public void run() {
+						setText(R.id.add_custom_catalog_title, link.getTitle());
+						setText(R.id.add_custom_catalog_summary, link.getSummary());
+						setText(R.id.add_custom_catalog_error, myError);
+					}
+				});
+			}
+		}; 
+		UIUtil.wait("loadingCatalogInfo", loadInfoRunnable, this);
+	}
+}

From 8c821f34b8d812964c744565a93351c57c1ed70c Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sun, 27 Feb 2011 23:46:04 +0300
Subject: [PATCH 05/13] custom catalog activity (in progress)

---
 AndroidManifest.xml                           |   2 +-
 AndroidManifest.xml.pattern                   |   2 +-
 icons/fbreader.png                            | Bin 23890 -> 6584 bytes
 .../network/AddCustomCatalogActivity.java     |  40 +++++++++++++++---
 .../network/AddCustomCatalogItemActions.java  |   3 +-
 .../fbreader/network/NetworkBookActions.java  |   2 +-
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b12bf99a1..fa7cd9c54 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -134,7 +134,7 @@
 		<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:configChanges="orientation|keyboardHidden">
 			<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity" />
 		</activity>
-		<activity android:name="org.geometerplus.android.fbreader.network.AddCustomCatalogActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog">
+		<activity android:name="org.geometerplus.android.fbreader.network.AddCustomCatalogActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index 6d509e71d..63239e669 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -134,7 +134,7 @@
 		<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:configChanges="orientation|keyboardHidden">
 			<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity" />
 		</activity>
-		<activity android:name="org.geometerplus.android.fbreader.network.AddCustomCatalogActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog">
+		<activity android:name="org.geometerplus.android.fbreader.network.AddCustomCatalogActivity" android:process=":networkLibrary" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.Dialog">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/icons/fbreader.png b/icons/fbreader.png
index 149e037e3d19e358344f68d522469f4ea182d3d9..c1815b8db791fd596bc46dd0cc665ebb1094f6ea 100644
GIT binary patch
literal 6584
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

literal 23890
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
Y0BZli3n2XXbN~PV07*qoM6N<$f?~D&J^%m!

diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index 3112f38e3..9515fda62 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -20,8 +20,11 @@
 package org.geometerplus.android.fbreader.network;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -43,8 +46,7 @@ public class AddCustomCatalogActivity extends Activity {
 		Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this));
 		setContentView(R.layout.add_custom_catalog);
 
-		final ZLResource dialogResource = ZLResource.resource("dialog");
-		myResource = dialogResource.getResource("CustomCatalogDialog");
+		myResource = ZLResource.resource("dialog").getResource("CustomCatalogDialog");
 
 		setTitle(myResource.getResource("title").getValue());
 
@@ -55,20 +57,46 @@ public class AddCustomCatalogActivity extends Activity {
 		setTextFromResource(R.id.add_custom_catalog_url_example, "catalogUrlExample");
 		setTextFromResource(R.id.add_custom_catalog_summary_example, "catalogSummaryExample");
 
-		final ZLResource buttonResource = dialogResource.getResource("button");
-		setText(R.id.add_custom_catalog_ok_button, buttonResource.getResource("ok").getValue());
-		setText(R.id.add_custom_catalog_cancel_button, buttonResource.getResource("cancel").getValue());
+		setupButton(
+			R.id.add_custom_catalog_ok_button, "ok", new View.OnClickListener() {
+				public void onClick(View view) {
+					startActivity(
+						new Intent(AddCustomCatalogActivity.this, NetworkLibraryActivity.class)
+							.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
+					);
+					finish();
+				}
+			}
+		);
+		setupButton(
+			R.id.add_custom_catalog_cancel_button, "cancel", new View.OnClickListener() {
+				public void onClick(View view) {
+					finish();
+				}
+			}
+		);
 
 		final Uri uri = getIntent().getData();
 		if (uri != null) {
 			loadInfoByUri(uri);
-		} 
+		} else {
+			findViewById(R.id.add_custom_catalog_title_group).setVisibility(View.GONE);
+			findViewById(R.id.add_custom_catalog_summary_group).setVisibility(View.GONE);
+		}
 	}
 
 	private void setText(int id, String text) {
 		((TextView)findViewById(id)).setText(text);
 	}
 
+	private void setupButton(int id, String resourceKey, View.OnClickListener listener) {
+		final Button button = (Button)findViewById(id);
+		button.setText(
+			ZLResource.resource("dialog").getResource("button").getResource(resourceKey).getValue()
+		);
+		button.setOnClickListener(listener);
+	}
+
 	private void setTextFromResource(int id, String resourceKey) {
 		setText(id, myResource.getResource(resourceKey).getValue());
 	}
diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java
index d8ef4aedf..63f804209 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java
@@ -20,6 +20,7 @@
 package org.geometerplus.android.fbreader.network;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.view.Menu;
 import android.view.ContextMenu;
 
@@ -70,6 +71,6 @@ class AddCustomCatalogItemActions extends NetworkTreeActions {
 	}
 
 	public static void addCustomCatalog(Activity activity) {
-		NetworkDialog.show(activity, NetworkDialog.DIALOG_CUSTOM_CATALOG, null, null);
+		activity.startActivity(new Intent(activity, AddCustomCatalogActivity.class));
 	}
 }
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
index cff6a0021..7884c8915 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
@@ -308,7 +308,7 @@ class NetworkBookActions extends NetworkTreeActions {
 					Uri.fromFile(new File(local)),
 					activity.getApplicationContext(),
 					FBReader.class
-				).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+				).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK)
 			);
 		}
 	}

From 4a306a04274ea56e7e924dff14b948c563ef38d0 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 03:38:09 +0300
Subject: [PATCH 06/13] custom catalog activity: UI behaviour

---
 .../network/AddCustomCatalogActivity.java     | 143 +++++++++++++++---
 1 file changed, 122 insertions(+), 21 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index 9515fda62..81078a286 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -20,6 +20,8 @@
 package org.geometerplus.android.fbreader.network;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -39,6 +41,7 @@ import org.geometerplus.android.util.UIUtil;
 
 public class AddCustomCatalogActivity extends Activity {
 	private ZLResource myResource;
+	private String myURL;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -60,11 +63,28 @@ public class AddCustomCatalogActivity extends Activity {
 		setupButton(
 			R.id.add_custom_catalog_ok_button, "ok", new View.OnClickListener() {
 				public void onClick(View view) {
-					startActivity(
-						new Intent(AddCustomCatalogActivity.this, NetworkLibraryActivity.class)
-							.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
-					);
-					finish();
+					if (isEmptyString(myURL)) {
+						final String url = getTextById(R.id.add_custom_catalog_url);
+						if (isEmptyString(url)) {
+							setErrorByKey("urlIsEmpty");
+						} else {
+							try {
+								Uri uri = Uri.parse(url);
+								if (isEmptyString(uri.getScheme())) {
+									uri = Uri.parse("http://" + url);
+								}
+								if (isEmptyString(uri.getHost())) {
+									setErrorByKey("invalidUrl");
+								} else {
+									loadInfoByUri(uri);
+								}
+							} catch (Throwable t) {
+								setErrorByKey("invalidUrl");
+							}
+						}
+					} else {
+						gotoNetworkLibrary();
+					}
 				}
 			}
 		);
@@ -79,16 +99,44 @@ public class AddCustomCatalogActivity extends Activity {
 		final Uri uri = getIntent().getData();
 		if (uri != null) {
 			loadInfoByUri(uri);
+			setExtraFieldsVisibility(true);
 		} else {
-			findViewById(R.id.add_custom_catalog_title_group).setVisibility(View.GONE);
-			findViewById(R.id.add_custom_catalog_summary_group).setVisibility(View.GONE);
+			myURL = null;
+			setExtraFieldsVisibility(false);
 		}
 	}
 
-	private void setText(int id, String text) {
+	private boolean isEmptyString(String s) {
+		return s == null || s.length() == 0;
+	}
+
+	private void setExtraFieldsVisibility(boolean show) {
+		final int visibility = show ? View.VISIBLE : View.GONE;
+		runOnUiThread(new Runnable() {
+			public void run() {
+				findViewById(R.id.add_custom_catalog_title_group).setVisibility(visibility);
+				findViewById(R.id.add_custom_catalog_summary_group).setVisibility(visibility);
+			}
+		});
+	}
+
+	private void gotoNetworkLibrary() {
+		startActivity(
+			new Intent(AddCustomCatalogActivity.this, NetworkLibraryActivity.class)
+				.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
+		);
+		finish();
+	}
+
+	private void setTextById(int id, String text) {
 		((TextView)findViewById(id)).setText(text);
 	}
 
+	private String getTextById(int id) {
+		final String text = ((TextView)findViewById(id)).getText().toString();
+		return text != null ? text.trim() : null;
+	}
+
 	private void setupButton(int id, String resourceKey, View.OnClickListener listener) {
 		final Button button = (Button)findViewById(id);
 		button.setText(
@@ -98,22 +146,69 @@ public class AddCustomCatalogActivity extends Activity {
 	}
 
 	private void setTextFromResource(int id, String resourceKey) {
-		setText(id, myResource.getResource(resourceKey).getValue());
+		setTextById(id, myResource.getResource(resourceKey).getValue());
+	}
+
+	private void setErrorText(final String errorText) {
+		runOnUiThread(new Runnable() {
+			public void run() {
+				final TextView errorView = (TextView)findViewById(R.id.add_custom_catalog_error);
+				if (errorText != null) {
+					errorView.setText(errorText);
+					errorView.setVisibility(View.VISIBLE);
+				} else {
+					errorView.setVisibility(View.GONE);
+				}
+			}
+		});
+	}
+
+	private void setErrorByKey(final String resourceKey) {
+		setErrorText(myResource.getResource(resourceKey).getValue());
+	}
+
+	private void runErrorDialog(final String errorText) {
+		final DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int which) {
+				switch (which) {
+					case DialogInterface.BUTTON_POSITIVE:
+						setExtraFieldsVisibility(true);
+						break;
+					case DialogInterface.BUTTON_NEUTRAL:
+						break;
+					case DialogInterface.BUTTON_NEGATIVE:
+						AddCustomCatalogActivity.this.finish();
+						break;
+				}
+			}
+		};
+
+		final ZLResource dialogResource = ZLResource.resource("dialog");
+		final ZLResource boxResource = dialogResource.getResource("networkError");
+		final ZLResource buttonResource = dialogResource.getResource("button");
+		new AlertDialog.Builder(this)
+			.setTitle(boxResource.getResource("title").getValue())
+			.setMessage(errorText)
+			.setIcon(0)
+			.setPositiveButton(buttonResource.getResource("continue").getValue(), listener)
+			.setNeutralButton(buttonResource.getResource("editUrl").getValue(), listener)
+			.setNegativeButton(buttonResource.getResource("cancel").getValue(), listener)
+			.create().show();
 	}
 
 	private void loadInfoByUri(Uri uri) {
-		String httpUrl = uri.toString();
-		if (uri.getScheme() == null) {
-			httpUrl = "http://" + httpUrl;
-			uri = Uri.parse(httpUrl);
+		myURL = uri.toString();
+		if (isEmptyString(uri.getScheme())) {
+			myURL = "http://" + myURL;
+			uri = Uri.parse(myURL);
 		} else if ("opds".equals(uri.getScheme())) {
-			httpUrl = "http" + uri.toString().substring(4);
+			myURL = "http" + uri.toString().substring(4);
 		}
 
-		setText(R.id.add_custom_catalog_url, httpUrl);
+		setTextById(R.id.add_custom_catalog_url, myURL);
 		String siteName = uri.getHost();
-		if (siteName == null) {
-			setTextFromResource(R.id.add_custom_catalog_error, "invalidUrl");
+		if (isEmptyString(siteName)) {
+			setErrorByKey("invalidUrl");
 			return;
 		}
 
@@ -121,24 +216,30 @@ public class AddCustomCatalogActivity extends Activity {
 			siteName = siteName.substring(4);
 		}
 		final ICustomNetworkLink link =
-		OPDSLinkReader.createCustomLinkWithoutInfo(siteName, httpUrl);
+		OPDSLinkReader.createCustomLinkWithoutInfo(siteName, myURL);
 
 		final Runnable loadInfoRunnable = new Runnable() {
 			private String myError;
 
 			public void run() {
 				try {
+					myError = null;
 					link.reloadInfo();
 				} catch (ZLNetworkException e) {
 					myError = e.getMessage();
 				}
 				runOnUiThread(new Runnable() {
 					public void run() {
-						setText(R.id.add_custom_catalog_title, link.getTitle());
-						setText(R.id.add_custom_catalog_summary, link.getSummary());
-						setText(R.id.add_custom_catalog_error, myError);
+						if (myError == null) {
+							setTextById(R.id.add_custom_catalog_title, link.getTitle());
+							setTextById(R.id.add_custom_catalog_summary, link.getSummary());
+							setExtraFieldsVisibility(true);
+						} else {
+							runErrorDialog(myError);
+						}
 					}
 				});
+				setErrorText(myError);
 			}
 		}; 
 		UIUtil.wait("loadingCatalogInfo", loadInfoRunnable, this);

From 1adfbf95bd343d480afad3499dd90d077346aa9f Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 05:51:21 +0300
Subject: [PATCH 07/13] custom catalog activity (in progress); duplicate custom
 catalogs are allowed

---
 TODO.CustomCatalog                            |   3 +
 .../network/AddCustomCatalogActivity.java     |  97 +++----
 .../fbreader/network/CustomCatalogDialog.java | 238 ------------------
 .../network/NetworkCatalogActions.java        |   2 +-
 .../fbreader/network/NetworkDialog.java       |   4 -
 .../network/NetworkLibraryActivity.java       |  51 ++++
 .../network/SQLiteNetworkDatabase.java        |  21 +-
 .../fbreader/network/NetworkLibrary.java      |   9 +-
 .../fbreader/network/opds/OPDSCustomLink.java |   2 -
 .../fbreader/network/opds/OPDSLinkReader.java |   4 +-
 10 files changed, 132 insertions(+), 299 deletions(-)
 create mode 100644 TODO.CustomCatalog
 delete mode 100644 src/org/geometerplus/android/fbreader/network/CustomCatalogDialog.java

diff --git a/TODO.CustomCatalog b/TODO.CustomCatalog
new file mode 100644
index 000000000..faee9c60e
--- /dev/null
+++ b/TODO.CustomCatalog
@@ -0,0 +1,3 @@
+* hide keyboard after link loading
+* custom link editing
+* start FBReader in new task
diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index 81078a286..e1512ec50 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -41,7 +41,7 @@ import org.geometerplus.android.util.UIUtil;
 
 public class AddCustomCatalogActivity extends Activity {
 	private ZLResource myResource;
-	private String myURL;
+	private ICustomNetworkLink myLink;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -63,28 +63,7 @@ public class AddCustomCatalogActivity extends Activity {
 		setupButton(
 			R.id.add_custom_catalog_ok_button, "ok", new View.OnClickListener() {
 				public void onClick(View view) {
-					if (isEmptyString(myURL)) {
-						final String url = getTextById(R.id.add_custom_catalog_url);
-						if (isEmptyString(url)) {
-							setErrorByKey("urlIsEmpty");
-						} else {
-							try {
-								Uri uri = Uri.parse(url);
-								if (isEmptyString(uri.getScheme())) {
-									uri = Uri.parse("http://" + url);
-								}
-								if (isEmptyString(uri.getHost())) {
-									setErrorByKey("invalidUrl");
-								} else {
-									loadInfoByUri(uri);
-								}
-							} catch (Throwable t) {
-								setErrorByKey("invalidUrl");
-							}
-						}
-					} else {
-						gotoNetworkLibrary();
-					}
+					onOkButton();
 				}
 			}
 		);
@@ -101,11 +80,54 @@ public class AddCustomCatalogActivity extends Activity {
 			loadInfoByUri(uri);
 			setExtraFieldsVisibility(true);
 		} else {
-			myURL = null;
+			myLink = null;
 			setExtraFieldsVisibility(false);
 		}
 	}
 
+	private void onOkButton() {
+		final String textUrl = getTextById(R.id.add_custom_catalog_url);
+		if (isEmptyString(textUrl)) {
+			setErrorByKey("urlIsEmpty");
+			return;
+		}
+
+		final String title = getTextById(R.id.add_custom_catalog_title);
+		final String summary = getTextById(R.id.add_custom_catalog_summary);
+		Uri uri = null;
+		try {
+			uri = Uri.parse(textUrl);
+			if (isEmptyString(uri.getScheme())) {
+				uri = Uri.parse("http://" + textUrl);
+			}
+			if (isEmptyString(uri.getHost())) {
+				setErrorByKey("invalidUrl");
+				return;
+			}
+		} catch (Throwable t) {
+			setErrorByKey("invalidUrl");
+			return;
+		}
+		if (myLink == null) {
+			loadInfoByUri(uri);
+		} else if (isEmptyString(title)) {
+			setErrorByKey("titleIsEmpty");
+		} else {
+			startActivity(
+				new Intent(
+					NetworkLibraryActivity.ADD_CATALOG,
+					uri,
+					AddCustomCatalogActivity.this,
+					NetworkLibraryActivity.class
+				)
+					.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, title)
+					.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, summary)
+					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
+			);
+			finish();
+		}
+	}
+
 	private boolean isEmptyString(String s) {
 		return s == null || s.length() == 0;
 	}
@@ -120,14 +142,6 @@ public class AddCustomCatalogActivity extends Activity {
 		});
 	}
 
-	private void gotoNetworkLibrary() {
-		startActivity(
-			new Intent(AddCustomCatalogActivity.this, NetworkLibraryActivity.class)
-				.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
-		);
-		finish();
-	}
-
 	private void setTextById(int id, String text) {
 		((TextView)findViewById(id)).setText(text);
 	}
@@ -197,15 +211,15 @@ public class AddCustomCatalogActivity extends Activity {
 	}
 
 	private void loadInfoByUri(Uri uri) {
-		myURL = uri.toString();
+		String textUrl = uri.toString();
 		if (isEmptyString(uri.getScheme())) {
-			myURL = "http://" + myURL;
-			uri = Uri.parse(myURL);
+			textUrl = "http://" + textUrl;
+			uri = Uri.parse(textUrl);
 		} else if ("opds".equals(uri.getScheme())) {
-			myURL = "http" + uri.toString().substring(4);
+			textUrl = "http" + uri.toString().substring(4);
 		}
 
-		setTextById(R.id.add_custom_catalog_url, myURL);
+		setTextById(R.id.add_custom_catalog_url, textUrl);
 		String siteName = uri.getHost();
 		if (isEmptyString(siteName)) {
 			setErrorByKey("invalidUrl");
@@ -215,8 +229,7 @@ public class AddCustomCatalogActivity extends Activity {
 		if (siteName.startsWith("www.")) {
 			siteName = siteName.substring(4);
 		}
-		final ICustomNetworkLink link =
-		OPDSLinkReader.createCustomLinkWithoutInfo(siteName, myURL);
+		myLink = OPDSLinkReader.createCustomLink(siteName, null, null, textUrl);
 
 		final Runnable loadInfoRunnable = new Runnable() {
 			private String myError;
@@ -224,15 +237,15 @@ 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_summary, link.getSummary());
+							setTextById(R.id.add_custom_catalog_title, myLink.getTitle());
+							setTextById(R.id.add_custom_catalog_summary, myLink.getSummary());
 							setExtraFieldsVisibility(true);
 						} else {
 							runErrorDialog(myError);
diff --git a/src/org/geometerplus/android/fbreader/network/CustomCatalogDialog.java b/src/org/geometerplus/android/fbreader/network/CustomCatalogDialog.java
deleted file mode 100644
index 944c2122c..000000000
--- a/src/org/geometerplus/android/fbreader/network/CustomCatalogDialog.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-package org.geometerplus.android.fbreader.network;
-
-import android.app.Dialog;
-import android.app.AlertDialog;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.TextView;
-import android.content.DialogInterface;
-
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.core.network.ZLNetworkException;
-
-import org.geometerplus.zlibrary.ui.android.R;
-
-import org.geometerplus.android.util.UIUtil;
-
-import org.geometerplus.fbreader.network.*;
-import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
-
-
-class CustomCatalogDialog extends NetworkDialog {
-
-	private String myTitle;
-	private String myUrl;
-	private String mySummary;
-
-	private boolean myLinkWithoutInfo;
-
-	public CustomCatalogDialog() {
-		super("CustomCatalogDialog");
-	}
-
-	@Override
-	protected void clearData() {
-		myTitle = myUrl = mySummary = null;
-		myLinkWithoutInfo = false;
-	}
-
-	@Override
-	protected View createLayout() {
-		final View layout = myActivity.getLayoutInflater().inflate(R.layout.network_custom_catalog_dialog, null);
-
-		((TextView) layout.findViewById(R.id.network_catalog_title_text)).setText(myResource.getResource("catalogTitle").getValue());
-		((TextView) layout.findViewById(R.id.network_catalog_url_text)).setText(myResource.getResource("catalogUrl").getValue());
-		((TextView) layout.findViewById(R.id.network_catalog_summary_text)).setText(myResource.getResource("catalogSummary").getValue());
-		((TextView) layout.findViewById(R.id.network_catalog_title_example)).setText(myResource.getResource("catalogTitleExample").getValue());
-		((TextView) layout.findViewById(R.id.network_catalog_url_example)).setText(myResource.getResource("catalogUrlExample").getValue());
-		((TextView) layout.findViewById(R.id.network_catalog_summary_example)).setText(myResource.getResource("catalogSummaryExample").getValue());
-
-		return layout;
-	}
-
-	@Override
-	protected void onPositive(DialogInterface dialog) {
-		AlertDialog alert = (AlertDialog) dialog;
-		myTitle = ((TextView) alert.findViewById(R.id.network_catalog_title)).getText().toString().trim();
-		myUrl = ((TextView) alert.findViewById(R.id.network_catalog_url)).getText().toString().trim();
-		mySummary = ((TextView) alert.findViewById(R.id.network_catalog_summary)).getText().toString().trim();
-
-		if (myTitle.length() == 0) {
-			myTitle = null;
-			if (myLink != null) {
-				final String err = myResource.getResource("titleIsEmpty").getValue();
-				sendError(true, false, err);
-				return;
-			}
-		}
-		if (myUrl.length() == 0) {
-			myUrl = null;
-			final String err = myResource.getResource("urlIsEmpty").getValue();
-			sendError(true, false, err);
-			return;
-		}
-		if (mySummary.length() == 0) {
-			mySummary = null;
-		}
-
-		Uri uri = Uri.parse(myUrl);
-		if (uri.getScheme() == null) {
-			myUrl = "http://" + myUrl;
-			uri = Uri.parse(myUrl);
-		}
-
-		String siteName = uri.getHost();
-		if (siteName == null) {
-			final String err = myResource.getResource("invalidUrl").getValue();
-			sendError(true, false, err);
-			return;
-		}
-		if (siteName.startsWith("www.")) {
-			siteName = siteName.substring(4);
-		}
-
-		final NetworkLibrary library = NetworkLibrary.Instance();
-		if (myLink != null && library.hasCustomLinkTitle(myTitle, myLink)) {
-			final String err = myResource.getResource("titleAlreadyExists").getValue();
-			sendError(true, false, err);
-			return;
-		}
-		if (library.hasCustomLinkSite(siteName, myLink)) {
-			final String err = myResource.getResource("siteAlreadyExists").getValue();
-			sendError(true, false, err);
-			return;
-		}
-
-		if (myLink != null) {
-			final ICustomNetworkLink link = (ICustomNetworkLink) myLink;
-			link.setSiteName(siteName);
-			link.setTitle(myTitle);
-			link.setSummary(mySummary);
-			link.setLink(INetworkLink.URL_MAIN, myUrl);
-
-			if (myLinkWithoutInfo) {
-				NetworkLibrary.Instance().addCustomLink(link);
-				myLinkWithoutInfo = false;
-			} else {
-				link.saveLink();
-			}
-			sendSuccess(true);
-			return;
-		}
-
-		myLinkWithoutInfo = true;
-		myLink = OPDSLinkReader.createCustomLinkWithoutInfo(siteName, myUrl);
-
-		final Handler handler = new Handler() {
-			public void handleMessage(Message msg) {
-				final String err = (String) msg.obj;
-				if (err != null) {
-					final DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							if (which == DialogInterface.BUTTON_NEGATIVE) {
-								sendSuccess(true);
-							} else {
-								if (which == DialogInterface.BUTTON_NEUTRAL) {
-									myLinkWithoutInfo = false;
-									myLink = null;
-								}
-								sendError(true, false, null);
-							}
-						}
-					};
-					final ZLResource dialogResource = ZLResource.resource("dialog");
-					final ZLResource boxResource = dialogResource.getResource("networkError");
-					final ZLResource buttonResource = dialogResource.getResource("button");
-					new AlertDialog.Builder(myActivity)
-						.setTitle(boxResource.getResource("title").getValue())
-						.setMessage(err)
-						.setIcon(0)
-						.setPositiveButton(buttonResource.getResource("continue").getValue(), listener)
-						.setNeutralButton(buttonResource.getResource("editUrl").getValue(), listener)
-						.setNegativeButton(buttonResource.getResource("cancel").getValue(), listener)
-						.setOnCancelListener(new DialogInterface.OnCancelListener() {
-							public void onCancel(DialogInterface dialog) {
-								listener.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
-							}
-						})
-						.create().show();
-				} else {
-					sendError(true, false, null);
-				}
-			}
-		};
-
-		final Runnable loadInfoRunnable = new Runnable() {
-			public void run() {
-				String error = null;
-				try {
-					((ICustomNetworkLink)myLink).reloadInfo();
-				} catch (ZLNetworkException e) {
-					error = e.getMessage();
-				}
-				handler.sendMessage(handler.obtainMessage(0, error));
-			}
-		}; 
-		UIUtil.wait("loadingCatalogInfo", loadInfoRunnable, myActivity);
-	}
-
-	@Override
-	protected void onNegative(DialogInterface dialog) {
-		sendCancel(false);
-	}
-
-	@Override
-	public void prepareDialogInternal(Dialog dialog) {
-		if (myLink != null) {
-			if (myTitle == null) myTitle = myLink.getTitle();
-			if (myUrl == null) myUrl = myLink.getLink(INetworkLink.URL_MAIN);
-			if (mySummary == null) mySummary = myLink.getSummary();
-		}
-		((TextView) dialog.findViewById(R.id.network_catalog_title)).setText(myTitle);
-		((TextView) dialog.findViewById(R.id.network_catalog_url)).setText(myUrl);
-		((TextView) dialog.findViewById(R.id.network_catalog_summary)).setText(mySummary);
-
-		final int examplesVisibility = (myLink == null || myLinkWithoutInfo) ? View.VISIBLE : View.GONE;
-		dialog.findViewById(R.id.network_catalog_title_example).setVisibility(examplesVisibility);
-		dialog.findViewById(R.id.network_catalog_url_example).setVisibility(examplesVisibility);
-		dialog.findViewById(R.id.network_catalog_summary_example).setVisibility(examplesVisibility);
-
-		final int groupsVisibility = (myLink != null) ? View.VISIBLE : View.GONE;
-		dialog.findViewById(R.id.network_catalog_title_group).setVisibility(groupsVisibility);
-		dialog.findViewById(R.id.network_catalog_summary_group).setVisibility(groupsVisibility);
-
-		final TextView error = (TextView) dialog.findViewById(R.id.network_catalog_error);
-		if (myErrorMessage == null) {
-			error.setVisibility(View.GONE);
-			error.setText("");
-		} else {
-			error.setVisibility(View.VISIBLE);
-			error.setText(myErrorMessage);
-		}
-
-		View dlgView = dialog.findViewById(R.id.network_custom_catalog_dialog);
-		dlgView.invalidate();
-		dlgView.requestLayout();
-	}
-}
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
index 2fe1265e6..5347765eb 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
@@ -246,7 +246,7 @@ class NetworkCatalogActions extends NetworkTreeActions {
 				new RefillAccountActions().runStandalone(activity, ((RefillAccountTree)activity.getDefaultTree()).Link);
 				return true;
 			case CUSTOM_CATALOG_EDIT:
-				NetworkDialog.show(activity, NetworkDialog.DIALOG_CUSTOM_CATALOG, ((NetworkCatalogTree)tree).Item.Link, null);
+				//NetworkDialog.show(activity, NetworkDialog.DIALOG_CUSTOM_CATALOG, ((NetworkCatalogTree)tree).Item.Link, null);
 				return true;
 			case CUSTOM_CATALOG_REMOVE:
 				removeCustomLink((ICustomNetworkLink)((NetworkCatalogTree)tree).Item.Link);
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkDialog.java b/src/org/geometerplus/android/fbreader/network/NetworkDialog.java
index 5a9347a77..45b8d4599 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkDialog.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkDialog.java
@@ -39,7 +39,6 @@ abstract class NetworkDialog {
 
 	// dialog identifiers
 	public static final int DIALOG_AUTHENTICATION = 0;
-	public static final int DIALOG_CUSTOM_CATALOG = 1;
 
 	private static final TreeMap<Integer, NetworkDialog> ourInstances = new TreeMap<Integer, NetworkDialog>();
 
@@ -50,9 +49,6 @@ abstract class NetworkDialog {
 			case DIALOG_AUTHENTICATION:
 				dlg = new AuthenticationDialog();
 				break;
-			case DIALOG_CUSTOM_CATALOG:
-				dlg = new CustomCatalogDialog();
-				break;
 			}
 			if (dlg != null) {
 				dlg.myId = id;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
index e4b74009d..23c822f40 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
@@ -24,6 +24,7 @@ import java.util.*;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -40,9 +41,17 @@ import org.geometerplus.android.util.UIUtil;
 
 import org.geometerplus.fbreader.network.NetworkTree;
 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";
+
+	final static String ADD_CATALOG_TITLE_KEY = "title";
+	final static String ADD_CATALOG_SUMMARY_KEY = "summary";
+
 	private NetworkTree myTree;
+	private volatile Intent myIntent;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -50,6 +59,40 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
+
+		myIntent = getIntent();
+	}
+
+	@Override
+	protected void onNewIntent(Intent intent) {
+		super.onNewIntent(intent);
+
+		processIntent(intent);
+	}
+
+	private void processIntent(Intent intent) {
+		if (ADD_CATALOG.equals(intent.getAction())) {
+			final Uri uri = intent.getData();
+			final String title = intent.getStringExtra(ADD_CATALOG_TITLE_KEY);
+			final String summary = intent.getStringExtra(ADD_CATALOG_SUMMARY_KEY);
+			if (uri != null && title != null) {
+				final ICustomNetworkLink link = OPDSLinkReader.createCustomLink(
+					uri.getHost(), title, summary, uri.toString()
+				);
+				if (link != null) {
+					runOnUiThread(new Runnable() {
+						public void run() {
+							final NetworkLibrary library = NetworkLibrary.Instance();
+							library.addCustomLink(link);
+							library.updateChildren();
+							library.synchronize();
+							NetworkView.Instance().fireModelChangedAsync();
+							getListView().invalidateViews();
+						}
+					});
+				}
+			}
+		}
 	}
 
 	private void prepareView() {
@@ -74,6 +117,10 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 			}
 		} else {
 			prepareView();
+			if (myIntent != null) {
+				processIntent(myIntent);
+				myIntent = null;
+			}
 		}
 	}
 
@@ -114,6 +161,10 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 					String error = null;
 					try {
 						NetworkView.Instance().initialize();
+						if (myActivity.myIntent != null) {
+							myActivity.processIntent(myActivity.myIntent);
+							myActivity.myIntent = null;
+						}
 					} catch (ZLNetworkException e) {
 						error = e.getMessage();
 					}
diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
index 3c3abf2bb..324b4b36f 100644
--- a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
+++ b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
@@ -41,7 +41,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
 
 	private void migrate() {
 		final int version = myDatabase.getVersion();
-		final int currentCodeVersion = 1;
+		final int currentCodeVersion = 2;
 		if (version >= currentCodeVersion) {
 			return;
 		}
@@ -49,12 +49,14 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
 		switch (version) {
 			case 0:
 				createTables();
+			case 1:
+				updateTables1();
 		}
 		myDatabase.setTransactionSuccessful();
 		myDatabase.endTransaction();
 
 		myDatabase.execSQL("VACUUM");
-		myDatabase.setVersion(currentCodeVersion);
+		//myDatabase.setVersion(currentCodeVersion);
 	}
 
 	protected void executeAsATransaction(Runnable actions) {
@@ -155,7 +157,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
 					if (dbValue == null) {
 						if (myInsertCustomLinkUrlStatement == null) {
 							myInsertCustomLinkUrlStatement = myDatabase.compileStatement(
-									"INSERT INTO CustomLinkUrls(url,link_id,key) VALUES (?,?,?)");
+									"INSERT OR REPLACE INTO CustomLinkUrls(url,link_id,key) VALUES (?,?,?)");
 						}
 						urlStatement = myInsertCustomLinkUrlStatement;
 					} else if (!value.equals(dbValue)) {
@@ -230,4 +232,17 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
 					"url TEXT NOT NULL," +
 					"CONSTRAINT CustomLinkUrls_PK PRIMARY KEY (key, link_id))");
 	}
+
+	private void updateTables1() {
+		myDatabase.execSQL("ALTER TABLE CustomLinks RENAME TO CustomLinks_Obsolete");
+		myDatabase.execSQL(
+				"CREATE TABLE CustomLinks(" +
+					"link_id INTEGER PRIMARY KEY," +
+					"title TEXT NOT NULL," +
+					"site_name TEXT NOT NULL," +
+					"summary TEXT," +
+					"icon TEXT)");
+		myDatabase.execSQL("INSERT INTO CustomLinks (link_id,title,site_name,summary,icon) SELECT link_id,title,site_name,summary,icon FROM CustomLinks_Obsolete");
+		myDatabase.execSQL("DROP TABLE CustomLinks_Obsolete");
+	}
 }
diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
index 7f276b73f..20610314c 100644
--- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java
+++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
@@ -303,11 +303,6 @@ public class NetworkLibrary {
 		myUpdateVisibility = true;
 	}
 
-
-	private static boolean linksEqual(INetworkLink l1, INetworkLink l2) {
-		return l1 == l2 || l1.getSiteName().equals(l2.getSiteName());
-	}
-
 	private static boolean linkIsInvalid(INetworkLink link, INetworkLink nodeLink) {
 		if (link instanceof ICustomNetworkLink) {
 			if (link != nodeLink) {
@@ -347,7 +342,7 @@ public class NetworkLibrary {
 						continue;
 					}
 					final INetworkLink nodeLink = ((NetworkCatalogTree) currentNode).Item.Link;
-					if (linksEqual(link, nodeLink)) {
+					if (link == nodeLink) {
 						if (linkIsInvalid(link, nodeLink)) {
 							toRemove.add(currentNode);
 						} else {
@@ -360,7 +355,7 @@ public class NetworkLibrary {
 						INetworkLink newNodeLink = null;
 						for (int j = i; j < links.size(); ++j) {
 							final INetworkLink jlnk = links.get(j);
-							if (linksEqual(nodeLink, jlnk)) {
+							if (nodeLink == jlnk) {
 								newNodeLink = jlnk;
 								break;
 							}
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
index ada9d7aa7..1af974740 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
@@ -33,9 +33,7 @@ import org.geometerplus.fbreader.network.ICustomNetworkLink;
 import org.geometerplus.fbreader.network.INetworkLink;
 import org.geometerplus.fbreader.network.NetworkException;
 
-
 class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLink {
-
 	private int myId;
 	private SaveLinkListener myListener;
 
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
index e8933fadf..4c1a31325 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
@@ -46,10 +46,10 @@ public class OPDSLinkReader {
 		return new OPDSCustomLink(id, siteName, title, summary, icon, links);
 	}
 
-	public static ICustomNetworkLink createCustomLinkWithoutInfo(String siteName, String url) {
+	public static ICustomNetworkLink createCustomLink(String siteName, String title, String summary, String url) {
 		final HashMap<String, String> links = new HashMap<String, String>();
 		links.put(INetworkLink.URL_MAIN, url);
-		return new OPDSCustomLink(ICustomNetworkLink.INVALID_ID, siteName, null, null, null, links);
+		return new OPDSCustomLink(ICustomNetworkLink.INVALID_ID, siteName, title, summary, null, links);
 	}
 
 	public static final int CACHE_LOAD = 0;

From 2ebb665c94ae39d78329c08374e0114fb887b4a2 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 06:44:45 +0300
Subject: [PATCH 08/13] custom link editing (in progress)

---
 .../network/AddCustomCatalogActivity.java     | 56 ++++++++++++-------
 .../network/NetworkCatalogActions.java        | 17 +++++-
 .../network/NetworkLibraryActivity.java       |  6 +-
 .../network/SQLiteNetworkDatabase.java        |  2 +-
 4 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index e1512ec50..eea05074c 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -41,7 +41,7 @@ import org.geometerplus.android.util.UIUtil;
 
 public class AddCustomCatalogActivity extends Activity {
 	private ZLResource myResource;
-	private ICustomNetworkLink myLink;
+	private Integer myCatalogId;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -75,12 +75,20 @@ public class AddCustomCatalogActivity extends Activity {
 			}
 		);
 
-		final Uri uri = getIntent().getData();
+		final Intent intent = getIntent();
+		final Uri uri = intent.getData();
+		myCatalogId = null;
 		if (uri != null) {
-			loadInfoByUri(uri);
+			if (intent.hasExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY)) {
+				myCatalogId = intent.getIntExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY, 0);
+				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));
+			} else {
+				loadInfoByUri(uri);
+			}
 			setExtraFieldsVisibility(true);
 		} else {
-			myLink = null;
 			setExtraFieldsVisibility(false);
 		}
 	}
@@ -108,22 +116,25 @@ public class AddCustomCatalogActivity extends Activity {
 			setErrorByKey("invalidUrl");
 			return;
 		}
-		if (myLink == null) {
+		if (!getExtraFieldsVisibility()) {
 			loadInfoByUri(uri);
 		} else if (isEmptyString(title)) {
 			setErrorByKey("titleIsEmpty");
 		} else {
-			startActivity(
-				new Intent(
-					NetworkLibraryActivity.ADD_CATALOG,
-					uri,
-					AddCustomCatalogActivity.this,
-					NetworkLibraryActivity.class
-				)
-					.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, title)
-					.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, summary)
-					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
-			);
+			final String action = myCatalogId == null ?
+				NetworkLibraryActivity.ADD_CATALOG : NetworkLibraryActivity.EDIT_CATALOG;
+			final Intent intent = new Intent(
+				action, uri,
+				AddCustomCatalogActivity.this,
+				NetworkLibraryActivity.class
+			)
+				.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, title)
+				.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, summary)
+				.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+			if (myCatalogId != null) {
+				intent.putExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY, (int)myCatalogId);
+			}
+			startActivity(intent);
 			finish();
 		}
 	}
@@ -132,6 +143,10 @@ 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() {
@@ -229,7 +244,8 @@ public class AddCustomCatalogActivity extends Activity {
 		if (siteName.startsWith("www.")) {
 			siteName = siteName.substring(4);
 		}
-		myLink = OPDSLinkReader.createCustomLink(siteName, null, null, textUrl);
+		final ICustomNetworkLink link =
+			OPDSLinkReader.createCustomLink(siteName, null, null, textUrl);
 
 		final Runnable loadInfoRunnable = new Runnable() {
 			private String myError;
@@ -237,15 +253,15 @@ public class AddCustomCatalogActivity extends Activity {
 			public void run() {
 				try {
 					myError = null;
-					myLink.reloadInfo();
+					link.reloadInfo();
 				} catch (ZLNetworkException e) {
 					myError = e.getMessage();
 				}
 				runOnUiThread(new Runnable() {
 					public void run() {
 						if (myError == null) {
-							setTextById(R.id.add_custom_catalog_title, myLink.getTitle());
-							setTextById(R.id.add_custom_catalog_summary, myLink.getSummary());
+							setTextById(R.id.add_custom_catalog_title, link.getTitle());
+							setTextById(R.id.add_custom_catalog_summary, link.getSummary());
 							setExtraFieldsVisibility(true);
 						} else {
 							runErrorDialog(myError);
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
index 5347765eb..4c93f754b 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
@@ -23,6 +23,8 @@ import java.util.*;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Message;
 import android.os.Handler;
 import android.view.Menu;
@@ -246,8 +248,21 @@ class NetworkCatalogActions extends NetworkTreeActions {
 				new RefillAccountActions().runStandalone(activity, ((RefillAccountTree)activity.getDefaultTree()).Link);
 				return true;
 			case CUSTOM_CATALOG_EDIT:
-				//NetworkDialog.show(activity, NetworkDialog.DIALOG_CUSTOM_CATALOG, ((NetworkCatalogTree)tree).Item.Link, null);
+			{
+				final ICustomNetworkLink link =
+					(ICustomNetworkLink)((NetworkCatalogTree)tree).Item.Link;
+				final String textUrl = link.getLink(INetworkLink.URL_MAIN);
+				if (textUrl != null) {
+					activity.startActivity(
+						new Intent(activity, AddCustomCatalogActivity.class)
+							.setData(Uri.parse(textUrl))
+							.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, link.getTitle())
+							.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, link.getSummary())
+							.putExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY, link.getId())
+					);
+				}
 				return true;
+			}
 			case CUSTOM_CATALOG_REMOVE:
 				removeCustomLink((ICustomNetworkLink)((NetworkCatalogTree)tree).Item.Link);
 				return true;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
index 23c822f40..cb693eaaa 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
@@ -46,9 +46,11 @@ import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
 
 public class NetworkLibraryActivity extends NetworkBaseActivity {
 	final static String ADD_CATALOG = "android.fbreader.action.ADD_CATALOG";
+	final static String EDIT_CATALOG = "android.fbreader.action.EDIT_CATALOG";
 
 	final static String ADD_CATALOG_TITLE_KEY = "title";
 	final static String ADD_CATALOG_SUMMARY_KEY = "summary";
+	final static String EDIT_CATALOG_ID_KEY = "id";
 
 	private NetworkTree myTree;
 	private volatile Intent myIntent;
@@ -71,7 +73,8 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 	}
 
 	private void processIntent(Intent intent) {
-		if (ADD_CATALOG.equals(intent.getAction())) {
+		final String action = intent.getAction();
+		if (ADD_CATALOG.equals(action)) {
 			final Uri uri = intent.getData();
 			final String title = intent.getStringExtra(ADD_CATALOG_TITLE_KEY);
 			final String summary = intent.getStringExtra(ADD_CATALOG_SUMMARY_KEY);
@@ -92,6 +95,7 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 					});
 				}
 			}
+		} else if (EDIT_CATALOG.equals(action)) {
 		}
 	}
 
diff --git a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
index 324b4b36f..c9973f4db 100644
--- a/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
+++ b/src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
@@ -56,7 +56,7 @@ class SQLiteNetworkDatabase extends NetworkDatabase {
 		myDatabase.endTransaction();
 
 		myDatabase.execSQL("VACUUM");
-		//myDatabase.setVersion(currentCodeVersion);
+		myDatabase.setVersion(currentCodeVersion);
 	}
 
 	protected void executeAsATransaction(Runnable actions) {

From 85dcdbd16323f3d266f5b1c691117df37f7fdf36 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 07:32:06 +0300
Subject: [PATCH 09/13] code simplification; custom catalog editing

---
 .../network/AddCustomCatalogActivity.java     | 41 +++++++++++--------
 .../network/NetworkCatalogActions.java        |  3 +-
 .../network/NetworkLibraryActivity.java       | 40 +++++++++---------
 .../fbreader/network/ICustomNetworkLink.java  |  8 ----
 .../fbreader/network/NetworkLibrary.java      | 25 ++++++-----
 .../fbreader/network/opds/OPDSCustomLink.java | 13 ------
 .../fbreader/network/opds/OPDSLinkReader.java |  8 +++-
 7 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index eea05074c..f622671d2 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -42,6 +42,7 @@ import org.geometerplus.android.util.UIUtil;
 public class AddCustomCatalogActivity extends Activity {
 	private ZLResource myResource;
 	private Integer myCatalogId;
+	private String myIcon;
 
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -77,13 +78,16 @@ public class AddCustomCatalogActivity extends Activity {
 
 		final Intent intent = getIntent();
 		final Uri uri = intent.getData();
-		myCatalogId = null;
+		myCatalogId = ICustomNetworkLink.INVALID_ID;
 		if (uri != null) {
-			if (intent.hasExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY)) {
-				myCatalogId = intent.getIntExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY, 0);
+			myCatalogId = intent.getIntExtra(
+				NetworkLibraryActivity.ADD_CATALOG_ID_KEY, myCatalogId
+			);
+			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);
 			}
@@ -121,20 +125,19 @@ public class AddCustomCatalogActivity extends Activity {
 		} else if (isEmptyString(title)) {
 			setErrorByKey("titleIsEmpty");
 		} else {
-			final String action = myCatalogId == null ?
-				NetworkLibraryActivity.ADD_CATALOG : NetworkLibraryActivity.EDIT_CATALOG;
-			final Intent intent = new Intent(
-				action, uri,
-				AddCustomCatalogActivity.this,
-				NetworkLibraryActivity.class
-			)
-				.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, title)
-				.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, summary)
-				.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-			if (myCatalogId != null) {
-				intent.putExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY, (int)myCatalogId);
-			}
-			startActivity(intent);
+			startActivity(
+				new Intent(
+					NetworkLibraryActivity.ADD_CATALOG,
+					uri,
+					AddCustomCatalogActivity.this,
+					NetworkLibraryActivity.class
+				)
+					.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, title)
+					.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, summary)
+					.putExtra(NetworkLibraryActivity.ADD_CATALOG_ICON_KEY, myIcon)
+					.putExtra(NetworkLibraryActivity.ADD_CATALOG_ID_KEY, myCatalogId)
+					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
+			);
 			finish();
 		}
 	}
@@ -245,7 +248,7 @@ public class AddCustomCatalogActivity extends Activity {
 			siteName = siteName.substring(4);
 		}
 		final ICustomNetworkLink link =
-			OPDSLinkReader.createCustomLink(siteName, null, null, textUrl);
+			OPDSLinkReader.createCustomLink(siteName, null, null, null, textUrl);
 
 		final Runnable loadInfoRunnable = new Runnable() {
 			private String myError;
@@ -262,9 +265,11 @@ public class AddCustomCatalogActivity extends Activity {
 						if (myError == null) {
 							setTextById(R.id.add_custom_catalog_title, link.getTitle());
 							setTextById(R.id.add_custom_catalog_summary, link.getSummary());
+							myIcon = link.getIcon();
 							setExtraFieldsVisibility(true);
 						} else {
 							runErrorDialog(myError);
+							myIcon = null;
 						}
 					}
 				});
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
index 4c93f754b..56ae2547b 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
@@ -258,7 +258,8 @@ class NetworkCatalogActions extends NetworkTreeActions {
 							.setData(Uri.parse(textUrl))
 							.putExtra(NetworkLibraryActivity.ADD_CATALOG_TITLE_KEY, link.getTitle())
 							.putExtra(NetworkLibraryActivity.ADD_CATALOG_SUMMARY_KEY, link.getSummary())
-							.putExtra(NetworkLibraryActivity.EDIT_CATALOG_ID_KEY, link.getId())
+							.putExtra(NetworkLibraryActivity.ADD_CATALOG_ICON_KEY, link.getIcon())
+							.putExtra(NetworkLibraryActivity.ADD_CATALOG_ID_KEY, link.getId())
 					);
 				}
 				return true;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
index cb693eaaa..446c98194 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
@@ -46,11 +46,11 @@ import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
 
 public class NetworkLibraryActivity extends NetworkBaseActivity {
 	final static String ADD_CATALOG = "android.fbreader.action.ADD_CATALOG";
-	final static String EDIT_CATALOG = "android.fbreader.action.EDIT_CATALOG";
 
 	final static String ADD_CATALOG_TITLE_KEY = "title";
 	final static String ADD_CATALOG_SUMMARY_KEY = "summary";
-	final static String EDIT_CATALOG_ID_KEY = "id";
+	final static String ADD_CATALOG_ICON_KEY = "icon";
+	final static String ADD_CATALOG_ID_KEY = "id";
 
 	private NetworkTree myTree;
 	private volatile Intent myIntent;
@@ -78,24 +78,26 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 			final Uri uri = intent.getData();
 			final String title = intent.getStringExtra(ADD_CATALOG_TITLE_KEY);
 			final String summary = intent.getStringExtra(ADD_CATALOG_SUMMARY_KEY);
-			if (uri != null && title != null) {
-				final ICustomNetworkLink link = OPDSLinkReader.createCustomLink(
-					uri.getHost(), title, summary, uri.toString()
-				);
-				if (link != null) {
-					runOnUiThread(new Runnable() {
-						public void run() {
-							final NetworkLibrary library = NetworkLibrary.Instance();
-							library.addCustomLink(link);
-							library.updateChildren();
-							library.synchronize();
-							NetworkView.Instance().fireModelChangedAsync();
-							getListView().invalidateViews();
-						}
-					});
-				}
+			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() {
+						final NetworkLibrary library = NetworkLibrary.Instance();
+						library.addCustomLink(link);
+						library.updateChildren();
+						library.synchronize();
+						NetworkView.Instance().fireModelChangedAsync();
+						getListView().invalidateViews();
+					}
+				});
 			}
-		} else if (EDIT_CATALOG.equals(action)) {
 		}
 	}
 
diff --git a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
index 5b6981116..7bd1e623e 100644
--- a/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/ICustomNetworkLink.java
@@ -22,19 +22,11 @@ package org.geometerplus.fbreader.network;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 public interface ICustomNetworkLink extends INetworkLink {
-
 	public static final int INVALID_ID = -1;
 
 	int getId();
 	void setId(int id);
 
-	interface SaveLinkListener {
-		void onSaveLink(ICustomNetworkLink link);
-	}
-
-	void setSaveLinkListener(SaveLinkListener listener);
-	void saveLink();
-
 	void setSiteName(String name);
 	void setTitle(String title);
 	void setSummary(String summary);
diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
index 20610314c..8d97231e7 100644
--- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java
+++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
@@ -182,7 +182,6 @@ public class NetworkLibrary {
 						final ICustomNetworkLink link = OPDSLinkReader.createCustomLink(id, siteName, title, summary, icon, links);
 						if (link != null) {
 							addLinkInternal(link);
-							link.setSaveLinkListener(myChangesListener);
 						}
 					}
 				}
@@ -463,12 +462,6 @@ public class NetworkLibrary {
 		}
 	}
 
-	private ICustomNetworkLink.SaveLinkListener myChangesListener = new ICustomNetworkLink.SaveLinkListener() {
-		public void onSaveLink(ICustomNetworkLink link) {
-			NetworkDatabase.Instance().saveCustomLink(link);
-		}
-	};
-
 	private <T extends INetworkLink> void addLinkInternal(T link) {
 		synchronized (myLinks) {
 			myLinks.add(link);
@@ -476,9 +469,20 @@ public class NetworkLibrary {
 	}
 
 	public void addCustomLink(ICustomNetworkLink link) {
-		addLinkInternal(link);
-		link.setSaveLinkListener(myChangesListener);
-		link.saveLink();
+		final int id = link.getId();
+		if (id == ICustomNetworkLink.INVALID_ID) {
+			addLinkInternal(link);
+		} else {
+			for (int i = myLinks.size() - 1; i >= 0; --i) {
+				final INetworkLink l = myLinks.get(i);
+				if (l instanceof ICustomNetworkLink &&
+					((ICustomNetworkLink)l).getId() == id) {
+					myLinks.set(i, link);
+					break;
+				}
+			}
+		}
+		NetworkDatabase.Instance().saveCustomLink(link);
 	}
 
 	public void removeCustomLink(ICustomNetworkLink link) {
@@ -486,7 +490,6 @@ public class NetworkLibrary {
 			myLinks.remove(link);
 		}
 		NetworkDatabase.Instance().deleteCustomLink(link);
-		link.setSaveLinkListener(null);
 	}
 
 	public boolean hasCustomLinkTitle(String title, INetworkLink exceptFor) {
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
index 1af974740..3fbe25a3b 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSCustomLink.java
@@ -35,7 +35,6 @@ import org.geometerplus.fbreader.network.NetworkException;
 
 class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLink {
 	private int myId;
-	private SaveLinkListener myListener;
 
 	private boolean myHasChanges;
 
@@ -52,18 +51,6 @@ class OPDSCustomLink extends OPDSNetworkLink implements ICustomNetworkLink {
 		myId = id;
 	}
 
-	public void setSaveLinkListener(SaveLinkListener listener) {
-		myListener = listener;
-	}
-
-	public void saveLink() {
-		if (myListener != null) {
-			myListener.onSaveLink(this);
-		} else {
-			throw new RuntimeException("Unable to save link: SaveLinkListener hasn't been set");
-		}
-	}
-
 	public boolean hasChanges() {
 		return myHasChanges;
 	}
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
index 4c1a31325..3c9a786ec 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java
@@ -46,10 +46,14 @@ public class OPDSLinkReader {
 		return new OPDSCustomLink(id, siteName, title, summary, icon, links);
 	}
 
-	public static ICustomNetworkLink createCustomLink(String siteName, String title, String summary, String url) {
+	public static ICustomNetworkLink createCustomLink(int id, String siteName, String title, String summary, String icon, String url) {
 		final HashMap<String, String> links = new HashMap<String, String>();
 		links.put(INetworkLink.URL_MAIN, url);
-		return new OPDSCustomLink(ICustomNetworkLink.INVALID_ID, siteName, title, summary, null, links);
+		return new OPDSCustomLink(id, siteName, title, summary, icon, links);
+	}
+
+	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;

From 5db3024ff36eae537f1cdeba8f28f24eba1aed01 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 07:32:47 +0300
Subject: [PATCH 10/13] updated TODO

---
 TODO.CustomCatalog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/TODO.CustomCatalog b/TODO.CustomCatalog
index faee9c60e..538bb4a49 100644
--- a/TODO.CustomCatalog
+++ b/TODO.CustomCatalog
@@ -1,3 +1,2 @@
-* hide keyboard after link loading
-* custom link editing
+* hide keyboard after catalog info loading
 * start FBReader in new task

From ce6144eee968085271d8da4be2818474e43b184f Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 07:49:59 +0300
Subject: [PATCH 11/13] icon rollback

---
 icons/fbreader.png | Bin 6584 -> 23890 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/fbreader.png b/icons/fbreader.png
index c1815b8db791fd596bc46dd0cc665ebb1094f6ea..149e037e3d19e358344f68d522469f4ea182d3d9 100644
GIT binary patch
literal 23890
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
Y0BZli3n2XXbN~PV07*qoM6N<$f?~D&J^%m!

literal 6584
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


From f6a2c5de29ac7fdb2edc8c28d07435ea839dfa6f Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 07:52:00 +0300
Subject: [PATCH 12/13] updated Changelog; cleanup

---
 ChangeLog                                    |   1 +
 res/layout/network_custom_catalog_dialog.xml | 141 -------------------
 2 files changed, 1 insertion(+), 141 deletions(-)
 delete mode 100644 res/layout/network_custom_catalog_dialog.xml

diff --git a/ChangeLog b/ChangeLog
index 897575fef..3826d0f1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ===== 0.99.14 (??? ??, 2011) =====
 * Thai localization (by Samphan Pojanasophanakul)
 * Fixed TTF font style detection
+* opds:// URLs support has been implemented
 
 ===== 0.99.13 (Feb 13, 2011) =====
 * Fixed book/position forgetting bug
diff --git a/res/layout/network_custom_catalog_dialog.xml b/res/layout/network_custom_catalog_dialog.xml
deleted file mode 100644
index 29d9592be..000000000
--- a/res/layout/network_custom_catalog_dialog.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/network_custom_catalog_dialog"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
->
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:paddingLeft="10dp"
-		android:paddingRight="10dp"
-		android:orientation="vertical"
-	>
-		<RelativeLayout
-			android:id="@+id/network_catalog_title_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-		>
-			<TextView
-				android:id="@+id/network_catalog_title_text"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_alignParentTop="true"
-			/>
-			<TextView
-				android:id="@+id/network_catalog_title_star"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="*"
-				android:textColor="#ffff0000"
-				android:layout_marginLeft="4dp"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/network_catalog_title_text"
-			/>
-			<EditText
-				android:id="@+id/network_catalog_title"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_alignParentLeft="true"
-				android:layout_toLeftOf="@id/network_catalog_title_star"
-				android:layout_below="@id/network_catalog_title_text"
-			/>
-			<TextView
-				android:id="@+id/network_catalog_title_example"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:gravity="right"
-				android:layout_alignParentBottom="true"
-				android:layout_below="@id/network_catalog_title"
-			/>
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:id="@+id/network_catalog_url_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="5dp"
-		>
-			<TextView
-				android:id="@+id/network_catalog_url_text"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_alignParentTop="true"
-			/>
-			<TextView
-				android:id="@+id/network_catalog_url_star"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="*"
-				android:textColor="#ffff0000"
-				android:layout_marginLeft="4dp"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/network_catalog_url_text"
-			/>
-			<EditText
-				android:id="@+id/network_catalog_url"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:inputType="textUri"
-				android:layout_alignParentLeft="true"
-				android:layout_toLeftOf="@id/network_catalog_url_star"
-				android:layout_below="@id/network_catalog_url_text"
-			/>
-			<TextView
-				android:id="@+id/network_catalog_url_example"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:gravity="right"
-				android:layout_alignParentBottom="true"
-				android:layout_below="@id/network_catalog_url"
-			/>
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:id="@+id/network_catalog_summary_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="5dp"
-		>
-			<TextView
-				android:id="@+id/network_catalog_summary_text"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_alignParentTop="true"
-			/>
-			<EditText
-				android:id="@+id/network_catalog_summary"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_below="@id/network_catalog_summary_text"
-			/>
-			<TextView
-				android:id="@+id/network_catalog_summary_example"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:gravity="right"
-				android:layout_alignParentBottom="true"
-				android:layout_below="@id/network_catalog_summary"
-			/>
-		</RelativeLayout>
-
-		<TextView
-			android:id="@+id/network_catalog_error"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:textColor="#ff0000"
-			android:layout_marginTop="5dp"
-			android:layout_marginBottom="5dp"
-		/>
-	</LinearLayout>
-</ScrollView>

From 36238693e44f029b2043cb372288a79e3cc9c3b1 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 28 Feb 2011 16:02:14 +0300
Subject: [PATCH 13/13] hide keyboard call

---
 TODO.CustomCatalog                                          | 1 -
 .../android/fbreader/network/AddCustomCatalogActivity.java  | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/TODO.CustomCatalog b/TODO.CustomCatalog
index 538bb4a49..47360a95c 100644
--- a/TODO.CustomCatalog
+++ b/TODO.CustomCatalog
@@ -1,2 +1 @@
-* hide keyboard after catalog info loading
 * start FBReader in new task
diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index f622671d2..56c4b13fd 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -26,6 +26,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.TextView;
 
@@ -64,6 +65,11 @@ public class AddCustomCatalogActivity extends Activity {
 		setupButton(
 			R.id.add_custom_catalog_ok_button, "ok", new View.OnClickListener() {
 				public void onClick(View view) {
+					final InputMethodManager imm =
+						(InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
+					imm.hideSoftInputFromWindow(findViewById(R.id.add_custom_catalog_url).getWindowToken(), 0);
+					imm.hideSoftInputFromWindow(findViewById(R.id.add_custom_catalog_title).getWindowToken(), 0);
+					imm.hideSoftInputFromWindow(findViewById(R.id.add_custom_catalog_summary).getWindowToken(), 0);
 					onOkButton();
 				}
 			}