From beff4ef43f1ce824bbf097ba32738a107ff9a84b Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 22 Dec 2014 02:10:50 +0000
Subject: [PATCH] better processing of "opds://" urls

---
 .../android/fbreader/network/AddCustomCatalogActivity.java    | 2 ++
 src/org/geometerplus/android/util/UIUtil.java                 | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index b3a7497fa..26466963a 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -135,6 +135,8 @@ public class AddCustomCatalogActivity extends Activity {
 				final INetworkLink link = NetworkLibrary.Instance().getLinkByUrl(uri.toString());
 				if (link instanceof ICustomNetworkLink) {
 					myLink = (ICustomNetworkLink)link;
+				} else {
+					openCatalog(uri);
 				}
 			}
 
diff --git a/src/org/geometerplus/android/util/UIUtil.java b/src/org/geometerplus/android/util/UIUtil.java
index 691792449..4e639cf8d 100644
--- a/src/org/geometerplus/android/util/UIUtil.java
+++ b/src/org/geometerplus/android/util/UIUtil.java
@@ -65,6 +65,8 @@ public abstract class UIUtil {
 							ourMonitor.notify();
 						}
 					} catch (Exception e) {
+						e.printStackTrace();
+						ourProgress = null;
 					}
 				}
 			};
@@ -94,7 +96,7 @@ public abstract class UIUtil {
 		final ProgressDialog currentProgress = ourProgress;
 		new Thread(new Runnable() {
 			public void run() {
-				while ((ourProgress == currentProgress) && !ourTaskQueue.isEmpty()) {
+				while (ourProgress == currentProgress && !ourTaskQueue.isEmpty()) {
 					Pair p = ourTaskQueue.poll();
 					p.Action.run();
 					synchronized (ourMonitor) {