From 53ec85193b48e88b0ef648db5c9ce3d3160bc852 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Thu, 30 Oct 2014 21:06:20 +0200
Subject: [PATCH] better catalog list processing

---
 .../android/fbreader/network/NetworkLibraryActivity.java       | 1 +
 .../fbreader/network/NetworkLibraryPrimaryActivity.java        | 2 --
 src/org/geometerplus/android/fbreader/network/Util.java        | 2 +-
 .../fbreader/network/action/RefreshRootCatalogAction.java      | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
index cd32b7b2d..d3530d3b8 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
@@ -95,6 +95,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity<NetworkTree> i
 						Util.initLibrary(NetworkLibraryActivity.this, myNetworkContext, new Runnable() {
 							public void run() {
 								NetworkLibrary.Instance().runBackgroundUpdate(false);
+								Util.requestCatalogPlugins(NetworkLibraryActivity.this);
 								if (intent != null) {
 									openTreeByIntent(intent);
 								}
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java
index ce0a5d008..b5128006f 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryPrimaryActivity.java
@@ -27,7 +27,5 @@ public class NetworkLibraryPrimaryActivity extends NetworkLibraryActivity {
 		super.onCreate(icicle);
 
 		myNetworkContext.reloadCookie();
-
-		Util.requestCatalogPlugins(this);
 	}
 }
diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java
index cc4f3e495..02fa302ec 100644
--- a/src/org/geometerplus/android/fbreader/network/Util.java
+++ b/src/org/geometerplus/android/fbreader/network/Util.java
@@ -174,7 +174,7 @@ public abstract class Util implements UserRegistrationConstants {
 		}
 	};
 
-	static void requestCatalogPlugins(Activity activity) {
+	public static void requestCatalogPlugins(Activity activity) {
 		activity.sendOrderedBroadcast(
 			new Intent(EXTRA_CATALOG_ACTION),
 			null,
diff --git a/src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java b/src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
index 31bf9cb8c..45ce0825e 100644
--- a/src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
+++ b/src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
@@ -26,6 +26,8 @@ import org.geometerplus.fbreader.network.NetworkLibrary;
 
 import org.geometerplus.zlibrary.ui.android.R;
 
+import org.geometerplus.android.fbreader.network.Util;
+
 public class RefreshRootCatalogAction extends RootAction {
 	public RefreshRootCatalogAction(Activity activity) {
 		super(activity, ActionCode.REFRESH, "refreshCatalogsList", R.drawable.ic_menu_refresh);
@@ -39,5 +41,6 @@ public class RefreshRootCatalogAction extends RootAction {
 	@Override
 	public void run(NetworkTree tree) {
 		NetworkLibrary.Instance().runBackgroundUpdate(true);
+		Util.requestCatalogPlugins(myActivity);
 	}
 }