yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

code cleanup

Browse source
This commit is contained in:
Nikolay Pultsin 2011-09-27 02:56:44 +01:00
parent 6caf54664a
commit d07cba1533
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
View file

@ -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;
}

6
src/org/geometerplus/android/fbreader/network/Util.java
View file

@ -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);
}
}