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

Merge branch 'master' into ice-cream-sandwich

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
This commit is contained in:
Nikolay Pultsin 2015-01-15 19:11:18 +00:00
commit 87ce04d49a
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
View file

@ -24,6 +24,7 @@ import java.util.*;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.SearchManager; import android.app.SearchManager;
import android.content.*; import android.content.*;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.*; import android.view.*;
import android.widget.AdapterView; import android.widget.AdapterView;
@ -282,8 +283,6 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
// Options menu // Options menu
// //
private Boolean myIsExternalViewSupported = null;
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
@ -292,15 +291,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
addMenuItem(menu, OptionsItemId.UploadAgain, "uploadAgain", -1, true); addMenuItem(menu, OptionsItemId.UploadAgain, "uploadAgain", -1, true);
addMenuItem(menu, OptionsItemId.TryAgain, "tryAgain", -1, true); addMenuItem(menu, OptionsItemId.TryAgain, "tryAgain", -1, true);
addMenuItem(menu, OptionsItemId.DeleteAll, "deleteAll", -1, true); addMenuItem(menu, OptionsItemId.DeleteAll, "deleteAll", -1, true);
addMenuItem(menu, OptionsItemId.ExternalView, "bookshelfView", -1, false);
if (myIsExternalViewSupported == null) {
final Intent externalIntent = new Intent(FBReaderIntents.Action.EXTERNAL_LIBRARY);
myIsExternalViewSupported = PackageUtil.canBeStarted(this, externalIntent, true);
}
if (myIsExternalViewSupported) {
addMenuItem(menu, OptionsItemId.ExternalView, "bookshelfView", -1, false);
}
return true; return true;
} }
@ -378,12 +369,11 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
} }
case OptionsItemId.ExternalView: case OptionsItemId.ExternalView:
{ {
final Intent externalIntent = new Intent(FBReaderIntents.Action.EXTERNAL_LIBRARY);
try { try {
startActivity(externalIntent); startActivity(new Intent(FBReaderIntents.Action.EXTERNAL_LIBRARY));
finish(); finish();
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
// ignore PackageUtil.installFromMarket(this, "org.fbreader.plugin.library");
} }
return true; return true;
} }