diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index 80c5bcb0d..731a23ef6 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -93,11 +93,15 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary. final Uri url = getIntent().getData(); if (url != null && "litres-book".equals(url.getScheme())) { myBook = OPDSBookItem.create( - NetworkLibrary.Instance().getLinkBySiteName("litres.ru"), + library.getLinkBySiteName("litres.ru"), url.toString().replace("litres-book://", "http://") ); } else { - final NetworkTree tree = Util.getTreeFromIntent(getIntent()); + final NetworkTree tree = library.getTreeByKey( + (NetworkTree.Key)getIntent().getSerializableExtra( + NetworkLibraryActivity.TREE_KEY_KEY + ) + ); if (tree instanceof NetworkBookTree) { myBook = ((NetworkBookTree)tree).Book; } diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java index 2150d119e..50bc15fe8 100644 --- a/src/org/geometerplus/android/fbreader/network/Util.java +++ b/src/org/geometerplus/android/fbreader/network/Util.java @@ -182,10 +182,4 @@ public abstract class Util implements UserRegistrationConstants { activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); } } - - public static NetworkTree getTreeFromIntent(Intent intent) { - final NetworkLibrary library = NetworkLibrary.Instance(); - final NetworkTree.Key key = (NetworkTree.Key)intent.getSerializableExtra(NetworkLibraryActivity.TREE_KEY_KEY); - return library.getTreeByKey(key); - } }