From 364e191be161faa366d27ccca745ebaa5301dcbb Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Mon, 15 Aug 2011 00:34:05 +0100 Subject: [PATCH] renaming: NetworkBaseActivity => NetworkLibraryActivity --- AndroidManifest.xml | 2 +- .../fbreader/ShowNetworkLibraryAction.java | 4 ++-- .../network/AddCustomCatalogActivity.java | 2 +- .../network/AddCustomCatalogItemActions.java | 6 +++--- .../fbreader/network/ItemsLoadingService.java | 4 ++-- .../fbreader/network/NetworkBookActions.java | 8 +++---- .../network/NetworkBookInfoActivity.java | 4 ++-- .../network/NetworkCatalogActions.java | 16 +++++++------- .../fbreader/network/NetworkInitializer.java | 21 +++++++++---------- ...ivity.java => NetworkLibraryActivity.java} | 10 ++++----- .../network/NetworkLibraryAdapter.java | 6 +++--- .../network/NetworkSearchActivity.java | 2 +- .../fbreader/network/NetworkTreeActions.java | 6 +++--- .../android/fbreader/network/NetworkView.java | 4 ++-- .../fbreader/network/SearchItemActions.java | 6 +++--- .../fbreader/network/TopupActions.java | 10 ++++----- .../android/fbreader/network/Util.java | 10 ++++----- 17 files changed, 60 insertions(+), 61 deletions(-) rename src/org/geometerplus/android/fbreader/network/{NetworkBaseActivity.java => NetworkLibraryActivity.java} (97%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4df6712e8..49c18abc4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -133,7 +133,7 @@ - + diff --git a/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java b/src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java index b313d9d84..bd02c9cde 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.NetworkBaseActivity; +import org.geometerplus.android.fbreader.network.NetworkLibraryActivity; class ShowNetworkLibraryAction extends RunActivityAction { ShowNetworkLibraryAction(FBReader baseActivity, FBReaderApp fbreader) { - super(baseActivity, fbreader, NetworkBaseActivity.class); + super(baseActivity, fbreader, NetworkLibraryActivity.class); } } diff --git a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java index e2af38409..9b03b88d4 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, - NetworkBaseActivity.class + NetworkLibraryActivity.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/AddCustomCatalogItemActions.java b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java index 2ec10a7fc..1b9c61fdc 100644 --- a/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java +++ b/src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemActions.java @@ -40,7 +40,7 @@ class AddCustomCatalogItemActions extends NetworkTreeActions { } @Override - public int getDefaultActionCode(NetworkBaseActivity activity, NetworkTree tree) { + public int getDefaultActionCode(NetworkLibraryActivity activity, NetworkTree tree) { return RUN_ITEM_ID; } @@ -50,12 +50,12 @@ class AddCustomCatalogItemActions extends NetworkTreeActions { } @Override - public boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree) { + public boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree) { return false; } @Override - public boolean runAction(NetworkBaseActivity activity, NetworkTree tree, int actionCode) { + public boolean runAction(NetworkLibraryActivity activity, NetworkTree tree, int actionCode) { switch (actionCode) { case RUN_ITEM_ID: addCustomCatalog(activity); diff --git a/src/org/geometerplus/android/fbreader/network/ItemsLoadingService.java b/src/org/geometerplus/android/fbreader/network/ItemsLoadingService.java index fad738a9b..285a24d55 100644 --- a/src/org/geometerplus/android/fbreader/network/ItemsLoadingService.java +++ b/src/org/geometerplus/android/fbreader/network/ItemsLoadingService.java @@ -42,7 +42,7 @@ public class ItemsLoadingService extends Service { if (doDownload) { context.startService( new Intent(context.getApplicationContext(), ItemsLoadingService.class) - .putExtra(NetworkBaseActivity.TREE_KEY_KEY, tree.getUniqueKey()) + .putExtra(NetworkLibraryActivity.TREE_KEY_KEY, tree.getUniqueKey()) ); } } @@ -89,7 +89,7 @@ public class ItemsLoadingService extends Service { doStop(); return; } - intent.removeExtra(NetworkBaseActivity.TREE_KEY_KEY); + intent.removeExtra(NetworkLibraryActivity.TREE_KEY_KEY); if (!NetworkView.Instance().isInitialized()) { doStop(); diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java index de5f4d21a..84648ab6e 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookActions.java @@ -99,7 +99,7 @@ class NetworkBookActions extends NetworkTreeActions { final NetworkBookTree bookTree = (NetworkBookTree) tree; final NetworkBookItem book = bookTree.Book; - Set actions = getContextMenuActions(book, ((NetworkBaseActivity)activity).Connection); + Set actions = getContextMenuActions(book, ((NetworkLibraryActivity)activity).Connection); for (Action a: actions) { if (a.Arg == null) { addMenuItem(menu, a.Id, a.Key); @@ -199,7 +199,7 @@ class NetworkBookActions extends NetworkTreeActions { } @Override - public int getDefaultActionCode(NetworkBaseActivity activity, NetworkTree tree) { + public int getDefaultActionCode(NetworkLibraryActivity activity, NetworkTree tree) { if (tree instanceof NetworkAuthorTree || tree instanceof NetworkSeriesTree) { return SHOW_BOOKS_ITEM_ID; } @@ -212,12 +212,12 @@ class NetworkBookActions extends NetworkTreeActions { } @Override - public boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree) { + public boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree) { return false; } @Override - public boolean runAction(NetworkBaseActivity activity, NetworkTree tree, int actionCode) { + public boolean runAction(NetworkLibraryActivity activity, NetworkTree tree, int actionCode) { if (tree instanceof NetworkAuthorTree || tree instanceof NetworkSeriesTree) { switch (actionCode) { case SHOW_BOOKS_ITEM_ID: diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index c9acfd4bd..442ad5c44 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -399,10 +399,10 @@ public class NetworkBookInfoActivity extends Activity implements NetworkView.Eve @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { - case NetworkBaseActivity.CUSTOM_AUTHENTICATION_CODE: + case NetworkLibraryActivity.CUSTOM_AUTHENTICATION_CODE: Util.processCustomAuthentication(this, myBook.Link, resultCode, data); break; - case NetworkBaseActivity.SIGNUP_CODE: + case NetworkLibraryActivity.SIGNUP_CODE: Util.processSignup(myBook.Link, resultCode, data); break; } diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java index e6b6aa00c..c3c31eb24 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java @@ -120,7 +120,7 @@ class NetworkCatalogActions extends NetworkTreeActions { } @Override - public int getDefaultActionCode(NetworkBaseActivity activity, NetworkTree tree) { + public int getDefaultActionCode(NetworkLibraryActivity activity, NetworkTree tree) { final NetworkCatalogItem item = ((NetworkCatalogTree)tree).Item; if (!(item instanceof NetworkURLCatalogItem)) { return OPEN_CATALOG_ITEM_ID; @@ -154,7 +154,7 @@ class NetworkCatalogActions extends NetworkTreeActions { } @Override - public boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree) { + public boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree) { final NetworkCatalogItem item = ((NetworkCatalogTree)tree).Item; final NetworkURLCatalogItem urlItem = item instanceof NetworkURLCatalogItem ? (NetworkURLCatalogItem)item : null; @@ -193,7 +193,7 @@ class NetworkCatalogActions extends NetworkTreeActions { return true; } - private boolean consumeByVisibility(final NetworkBaseActivity activity, final NetworkTree tree, final int actionCode) { + private boolean consumeByVisibility(final NetworkLibraryActivity activity, final NetworkTree tree, final int actionCode) { final NetworkCatalogItem item = ((NetworkCatalogTree)tree).Item; switch (item.getVisibility()) { case B3_TRUE: @@ -215,7 +215,7 @@ class NetworkCatalogActions extends NetworkTreeActions { } @Override - public boolean runAction(final NetworkBaseActivity activity, NetworkTree tree, int actionCode) { + public boolean runAction(final NetworkLibraryActivity activity, NetworkTree tree, int actionCode) { final NetworkCatalogTree catalogTree = (NetworkCatalogTree)tree; if (consumeByVisibility(activity, catalogTree, actionCode)) { return true; @@ -351,7 +351,7 @@ class NetworkCatalogActions extends NetworkTreeActions { } private void afterUpdateCatalog(String errorMessage, boolean childrenEmpty) { - final NetworkBaseActivity activity = NetworkBaseActivity.getByTree(myTree); + final NetworkLibraryActivity activity = NetworkLibraryActivity.getByTree(myTree); if (activity == null) { return; } @@ -382,7 +382,7 @@ class NetworkCatalogActions extends NetworkTreeActions { Util.TOPUP_ACTION, Uri.parse(tree.Item.Link.getUrl(UrlInfo.Type.Catalog)) ), - NetworkBaseActivity.LIST_TOPUP_METHODS_CODE + NetworkLibraryActivity.LIST_TOPUP_METHODS_CODE ); */ } @@ -435,7 +435,7 @@ class NetworkCatalogActions extends NetworkTreeActions { }); } - public void doReloadCatalog(NetworkBaseActivity activity, final NetworkCatalogTree tree) { + public void doReloadCatalog(NetworkLibraryActivity activity, final NetworkCatalogTree tree) { if (ItemsLoadingService.getRunnable(tree) != null) { return; } @@ -447,7 +447,7 @@ class NetworkCatalogActions extends NetworkTreeActions { ); } - private void doSignOut(final NetworkBaseActivity activity, NetworkCatalogTree tree) { + private void doSignOut(final NetworkLibraryActivity activity, NetworkCatalogTree tree) { final NetworkAuthenticationManager mgr = tree.Item.Link.authenticationManager(); final Runnable runnable = new Runnable() { public void run() { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java b/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java index 416cfea76..84b9d442d 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkInitializer.java @@ -19,7 +19,6 @@ package org.geometerplus.android.fbreader.network; -import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; @@ -32,14 +31,14 @@ import org.geometerplus.android.util.UIUtil; class NetworkInitializer { static NetworkInitializer Instance; - private Activity myActivity; + private NetworkLibraryActivity myActivity; - public NetworkInitializer(NetworkBaseActivity activity) { + public NetworkInitializer(NetworkLibraryActivity activity) { Instance = this; setActivity(activity); } - public void setActivity(NetworkBaseActivity activity) { + public void setActivity(NetworkLibraryActivity activity) { myActivity = activity; } @@ -60,9 +59,7 @@ class NetworkInitializer { String error = null; try { NetworkView.Instance().initialize(); - if (myActivity instanceof NetworkBaseActivity) { - ((NetworkBaseActivity)myActivity).processSavedIntent(); - } + myActivity.processSavedIntent(); } catch (ZLNetworkException e) { error = e.getMessage(); } @@ -104,10 +101,12 @@ class NetworkInitializer { myActivity.runOnUiThread(new Runnable() { public void run() { if (error == null) { - if (myActivity instanceof NetworkBaseActivity) { - final NetworkBaseActivity a = (NetworkBaseActivity)myActivity; - a.startService(new Intent(a.getApplicationContext(), LibraryInitializationService.class)); - a.onModelChanged(); // initialization is complete successfully + if (myActivity != null) { + myActivity.startService(new Intent( + myActivity.getApplicationContext(), + LibraryInitializationService.class + )); + myActivity.onModelChanged(); // initialization is complete successfully } } else { showTryAgainDialog(myActivity, error); // handle initialization error diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java similarity index 97% rename from src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java rename to src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java index 2eedc9731..0b1db78ab 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java @@ -46,7 +46,7 @@ import org.geometerplus.fbreader.network.tree.*; import org.geometerplus.android.fbreader.tree.BaseActivity; import org.geometerplus.android.fbreader.api.PluginApi; -public class NetworkBaseActivity extends BaseActivity implements NetworkView.EventListener { +public class NetworkLibraryActivity 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; @@ -54,14 +54,14 @@ public class NetworkBaseActivity extends BaseActivity implements NetworkView.Eve private static final String ACTIVITY_BY_TREE_KEY = "ActivityByTree"; - static void setForTree(NetworkTree tree, NetworkBaseActivity activity) { + static void setForTree(NetworkTree tree, NetworkLibraryActivity activity) { if (tree != null) { tree.setUserData(ACTIVITY_BY_TREE_KEY, activity); } } - static NetworkBaseActivity getByTree(NetworkTree tree) { - return (NetworkBaseActivity)tree.getUserData(ACTIVITY_BY_TREE_KEY); + static NetworkLibraryActivity getByTree(NetworkTree tree) { + return (NetworkLibraryActivity)tree.getUserData(ACTIVITY_BY_TREE_KEY); } public BookDownloaderServiceConnection Connection; @@ -415,7 +415,7 @@ public class NetworkBaseActivity extends BaseActivity implements NetworkView.Eve final ZLResource dialogResource = ZLResource.resource("dialog"); final ZLResource boxResource = dialogResource.getResource("networkError"); final ZLResource buttonResource = dialogResource.getResource("button"); - new AlertDialog.Builder(NetworkBaseActivity.this) + new AlertDialog.Builder(NetworkLibraryActivity.this) .setTitle(boxResource.getResource("title").getValue()) .setMessage((String) msg.obj) .setIcon(0) diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java index 67713c40a..bb7e2ef40 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryAdapter.java @@ -38,7 +38,7 @@ import org.geometerplus.fbreader.network.tree.*; import org.geometerplus.android.fbreader.tree.ListAdapter; class NetworkLibraryAdapter extends ListAdapter { - NetworkLibraryAdapter(NetworkBaseActivity activity) { + NetworkLibraryAdapter(NetworkLibraryActivity activity) { super(activity); } @@ -47,7 +47,7 @@ class NetworkLibraryAdapter extends ListAdapter { private final Runnable myInvalidateViewsRunnable = new Runnable() { public void run() { - ((NetworkBaseActivity)getActivity()).getListView().invalidateViews(); + ((NetworkLibraryActivity)getActivity()).getListView().invalidateViews(); } }; @@ -77,7 +77,7 @@ class NetworkLibraryAdapter extends ListAdapter { final int status = (tree instanceof NetworkBookTree) ? NetworkBookActions.getBookStatus( ((NetworkBookTree)tree).Book, - ((NetworkBaseActivity)getActivity()).Connection + ((NetworkLibraryActivity)getActivity()).Connection ) : 0; if (status != 0) { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java index e387738df..dbf1c026d 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java @@ -119,7 +119,7 @@ public class NetworkSearchActivity extends Activity { return; } - final NetworkBaseActivity activity = NetworkBaseActivity.getByTree(tree); + final NetworkLibraryActivity activity = NetworkLibraryActivity.getByTree(tree); if (activity != null) { final ZLResource buttonResource = dialogResource.getResource("button"); new AlertDialog.Builder(activity) diff --git a/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java b/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java index 7113e75fa..ddc4f4443 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java @@ -85,10 +85,10 @@ abstract class NetworkTreeActions { public abstract void buildContextMenu(Activity activity, ContextMenu menu, NetworkTree tree); - public abstract int getDefaultActionCode(NetworkBaseActivity activity, NetworkTree tree); + public abstract int getDefaultActionCode(NetworkLibraryActivity activity, NetworkTree tree); - public abstract boolean runAction(NetworkBaseActivity activity, NetworkTree tree, int actionCode); + public abstract boolean runAction(NetworkLibraryActivity activity, NetworkTree tree, int actionCode); public abstract boolean createOptionsMenu(Menu menu, NetworkTree tree); - public abstract boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree); + public abstract boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree); } diff --git a/src/org/geometerplus/android/fbreader/network/NetworkView.java b/src/org/geometerplus/android/fbreader/network/NetworkView.java index 6aa8c461b..d22d43411 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkView.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkView.java @@ -113,7 +113,7 @@ class NetworkView { return false; } - public boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree) { + public boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree) { final NetworkTreeActions actions = getActions(tree); if (actions != null) { return actions.prepareOptionsMenu(activity, menu, tree); @@ -121,7 +121,7 @@ class NetworkView { return false; } - public boolean runOptionsMenu(NetworkBaseActivity activity, MenuItem item, NetworkTree tree) { + public boolean runOptionsMenu(NetworkLibraryActivity activity, MenuItem item, NetworkTree tree) { final NetworkTreeActions actions = getActions(tree); if (actions != null) { return actions.runAction(activity, tree, item.getItemId()); diff --git a/src/org/geometerplus/android/fbreader/network/SearchItemActions.java b/src/org/geometerplus/android/fbreader/network/SearchItemActions.java index 115aad360..329d29ee0 100644 --- a/src/org/geometerplus/android/fbreader/network/SearchItemActions.java +++ b/src/org/geometerplus/android/fbreader/network/SearchItemActions.java @@ -50,7 +50,7 @@ class SearchItemActions extends NetworkTreeActions { } @Override - public int getDefaultActionCode(NetworkBaseActivity activity, NetworkTree tree) { + public int getDefaultActionCode(NetworkLibraryActivity activity, NetworkTree tree) { final boolean isLoading = ItemsLoadingService.getRunnable(tree) != null; if (!isLoading) { return RUN_SEARCH_ITEM_ID; @@ -64,12 +64,12 @@ class SearchItemActions extends NetworkTreeActions { } @Override - public boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree) { + public boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree) { return false; } @Override - public boolean runAction(NetworkBaseActivity activity, NetworkTree tree, int actionCode) { + public boolean runAction(NetworkLibraryActivity activity, NetworkTree tree, int actionCode) { switch (actionCode) { case RUN_SEARCH_ITEM_ID: activity.onSearchRequested(); diff --git a/src/org/geometerplus/android/fbreader/network/TopupActions.java b/src/org/geometerplus/android/fbreader/network/TopupActions.java index ed1423a4f..f7744da60 100644 --- a/src/org/geometerplus/android/fbreader/network/TopupActions.java +++ b/src/org/geometerplus/android/fbreader/network/TopupActions.java @@ -81,7 +81,7 @@ class TopupActions extends NetworkTreeActions { } @Override - public int getDefaultActionCode(NetworkBaseActivity activity, NetworkTree tree) { + public int getDefaultActionCode(NetworkLibraryActivity activity, NetworkTree tree) { return getDefaultActionCode(activity, ((TopUpTree)tree).Item.Link); } @@ -105,12 +105,12 @@ class TopupActions extends NetworkTreeActions { } @Override - public boolean prepareOptionsMenu(NetworkBaseActivity activity, Menu menu, NetworkTree tree) { + public boolean prepareOptionsMenu(NetworkLibraryActivity activity, Menu menu, NetworkTree tree) { return false; } @Override - public boolean runAction(NetworkBaseActivity activity, NetworkTree tree, int actionCode) { + public boolean runAction(NetworkLibraryActivity activity, NetworkTree tree, int actionCode) { final INetworkLink link = ((TopUpTree)tree).Item.Link; return runAction(activity, link, actionCode); } @@ -162,8 +162,8 @@ class TopupActions extends NetworkTreeActions { final int topupActionCode = getDefaultActionCode(activity, link); if (topupActionCode == TREE_SHOW_CONTEXT_MENU) { View view = null; - if (activity instanceof NetworkBaseActivity) { - view = ((NetworkBaseActivity)activity).getListView(); + if (activity instanceof NetworkLibraryActivity) { + view = ((NetworkLibraryActivity)activity).getListView(); } else if (activity instanceof NetworkBookInfoActivity) { view = ((NetworkBookInfoActivity)activity).getMainView(); } diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java index b96801856..3c3b63c14 100644 --- a/src/org/geometerplus/android/fbreader/network/Util.java +++ b/src/org/geometerplus/android/fbreader/network/Util.java @@ -72,7 +72,7 @@ abstract class Util implements UserRegistrationConstants { activity.startActivityForResult(new Intent( REGISTRATION_ACTION, Uri.parse(link.getUrl(UrlInfo.Type.SignUp)) - ), NetworkBaseActivity.SIGNUP_CODE); + ), NetworkLibraryActivity.SIGNUP_CODE); } } catch (ActivityNotFoundException e) { } @@ -94,7 +94,7 @@ abstract class Util implements UserRegistrationConstants { if (onSuccess != null) { ourAfterRegisrationMap.put(activity, onSuccess); } - activity.startActivityForResult(intent, NetworkBaseActivity.CUSTOM_AUTHENTICATION_CODE); + activity.startActivityForResult(intent, NetworkLibraryActivity.CUSTOM_AUTHENTICATION_CODE); } static void processCustomAuthentication(final Activity activity, final INetworkLink link, int resultCode, Intent data) { @@ -241,16 +241,16 @@ abstract class Util implements UserRegistrationConstants { static void openTree(Context context, NetworkTree tree) { final Class clz = tree instanceof NetworkBookTree - ? NetworkBookInfoActivity.class : NetworkBaseActivity.class; + ? NetworkBookInfoActivity.class : NetworkLibraryActivity.class; context.startActivity( new Intent(context.getApplicationContext(), clz) - .putExtra(NetworkBaseActivity.TREE_KEY_KEY, tree.getUniqueKey()) + .putExtra(NetworkLibraryActivity.TREE_KEY_KEY, tree.getUniqueKey()) ); } public static NetworkTree getTreeFromIntent(Intent intent) { final NetworkLibrary library = NetworkLibrary.Instance(); - final NetworkTree.Key key = (NetworkTree.Key)intent.getSerializableExtra(NetworkBaseActivity.TREE_KEY_KEY); + final NetworkTree.Key key = (NetworkTree.Key)intent.getSerializableExtra(NetworkLibraryActivity.TREE_KEY_KEY); return library.getTreeByKey(key); } }