yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Code Issues Releases Wiki Activity

updated external library/bookmarks call logic

Browse source
This commit is contained in:
Nikolay Pultsin 2013-04-20 18:56:21 +02:00
parent ca05831487
commit 72ea9adbf6
2 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/org/geometerplus/android/fbreader/ShowBookmarksAction.java
View file

@ -25,6 +25,8 @@ import android.content.Intent;
import org.geometerplus.fbreader.book.SerializerUtil;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.util.PackageUtil;
class ShowBookmarksAction extends FBAndroidAction {
ShowBookmarksAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader);
@ -37,14 +39,18 @@ class ShowBookmarksAction extends FBAndroidAction {
@Override
protected void run(Object ... params) {
try {
startBookmarksActivity(
new Intent("android.fbreader.action.EXTERNAL_BOOKMARKS")
);
} catch (ActivityNotFoundException e) {
startBookmarksActivity(
new Intent(BaseActivity.getApplicationContext(), BookmarksActivity.class)
);
final Intent externalIntent =
new Intent("android.fbreader.action.EXTERNAL_BOOKMARKS");
final Intent internalIntent =
new Intent(BaseActivity.getApplicationContext(), BookmarksActivity.class);
if (PackageUtil.canBeStarted(BaseActivity, externalIntent, true)) {
try {
startBookmarksActivity(externalIntent);
} catch (ActivityNotFoundException e) {
startBookmarksActivity(internalIntent);
}
} else {
startBookmarksActivity(internalIntent);
}
}