diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 214e2232a..57949ea72 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -127,7 +127,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index c26418d04..71437118c 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -127,7 +127,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
diff --git a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
index bd02c9cde..5846738af 100644
--- a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
+++ b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
@@ -21,10 +21,10 @@ package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
-import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
+import org.geometerplus.android.fbreader.network.NetworkTopLevelActivity;
class ShowNetworkLibraryAction extends RunActivityAction {
ShowNetworkLibraryAction(FBReader baseActivity, FBReaderApp fbreader) {
- super(baseActivity, fbreader, NetworkLibraryActivity.class);
+ super(baseActivity, fbreader, NetworkTopLevelActivity.class);
}
}
diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
index 9b03b88d4..ca0cac782 100644
--- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
@@ -167,7 +167,7 @@ public class AddCustomCatalogActivity extends Activity {
ADD_CATALOG,
uri,
AddCustomCatalogActivity.this,
- NetworkLibraryActivity.class
+ NetworkTopLevelActivity.class
).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
addLinkToIntent(intent, myLink);
startActivity(intent);
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
index a137eb2e1..f991f6919 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
@@ -45,7 +45,7 @@ import org.geometerplus.fbreader.network.tree.*;
import org.geometerplus.android.fbreader.tree.BaseActivity;
-abstract class NetworkBaseActivity extends BaseActivity implements NetworkView.EventListener {
+public class NetworkBaseActivity extends BaseActivity implements NetworkView.EventListener {
protected static final int BASIC_AUTHENTICATION_CODE = 1;
protected static final int CUSTOM_AUTHENTICATION_CODE = 2;
protected static final int SIGNUP_CODE = 3;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java
deleted file mode 100644
index a5b03be42..000000000
--- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Geometer Plus
- *
- * 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.os.Bundle;
-import android.view.*;
-import android.content.Intent;
-
-import org.geometerplus.fbreader.network.*;
-import org.geometerplus.fbreader.network.tree.*;
-import org.geometerplus.fbreader.tree.FBTree;
-
-public class NetworkCatalogActivity extends NetworkBaseActivity implements UserRegistrationConstants {
-}
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java b/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java
index e8b1eb755..e626650e0 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java
@@ -62,8 +62,8 @@ class NetworkInitializer extends Handler {
String error = null;
try {
NetworkView.Instance().initialize();
- if (myActivity instanceof NetworkLibraryActivity) {
- ((NetworkLibraryActivity)myActivity).processSavedIntent();
+ if (myActivity instanceof NetworkTopLevelActivity) {
+ ((NetworkTopLevelActivity)myActivity).processSavedIntent();
}
} catch (ZLNetworkException e) {
error = e.getMessage();
@@ -98,8 +98,8 @@ class NetworkInitializer extends Handler {
} else if (message.what == 0) {
runInitialization(); // run initialization process
} else if (message.obj == null) {
- if (myActivity instanceof NetworkLibraryActivity) {
- final NetworkLibraryActivity a = (NetworkLibraryActivity)myActivity;
+ if (myActivity instanceof NetworkTopLevelActivity) {
+ final NetworkTopLevelActivity a = (NetworkTopLevelActivity)myActivity;
a.startService(new Intent(a.getApplicationContext(), LibraryInitializationService.class));
a.onModelChanged(); // initialization is complete successfully
}
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkTopLevelActivity.java
similarity index 97%
rename from src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
rename to src/org/geometerplus/android/fbreader/network/NetworkTopLevelActivity.java
index 9183484d6..049db3210 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkTopLevelActivity.java
@@ -30,7 +30,7 @@ import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.opds.OPDSCustomNetworkLink;
import org.geometerplus.fbreader.network.urlInfo.*;
-public class NetworkLibraryActivity extends NetworkBaseActivity {
+public class NetworkTopLevelActivity extends NetworkBaseActivity {
private volatile Intent myIntent;
@Override
diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java
index 0639538fd..2cb9856bc 100644
--- a/src/org/geometerplus/android/fbreader/network/Util.java
+++ b/src/org/geometerplus/android/fbreader/network/Util.java
@@ -243,7 +243,7 @@ abstract class Util implements UserRegistrationConstants {
static void openTree(Context context, NetworkTree tree) {
final Class clz = tree instanceof NetworkBookTree
- ? NetworkBookInfoActivity.class : NetworkCatalogActivity.class;
+ ? NetworkBookInfoActivity.class : NetworkBaseActivity.class;
context.startActivity(
new Intent(context.getApplicationContext(), clz)
.putExtra(TREE_KEY_KEY, tree.getUniqueKey())