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

minor cleanups

Browse source
This commit is contained in:
Nikolay Pultsin 2015-08-06 13:37:57 +02:00
parent c2a3567993
commit 20c6effd33
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
View file

@ -100,7 +100,7 @@ public class BookInfoActivity extends Activity implements IBookCollection.Listen
// we force language & encoding detection // we force language & encoding detection
BookUtil.getEncoding(myBook, pluginCollection); BookUtil.getEncoding(myBook, pluginCollection);
setupCover(myBook); setupCover(myBook, pluginCollection);
setupBookInfo(myBook); setupBookInfo(myBook);
setupAnnotation(myBook, pluginCollection); setupAnnotation(myBook, pluginCollection);
setupFileInfo(myBook); setupFileInfo(myBook);
@ -186,13 +186,13 @@ public class BookInfoActivity extends Activity implements IBookCollection.Listen
((TextView)layout.findViewById(R.id.book_info_value)).setText(value); ((TextView)layout.findViewById(R.id.book_info_value)).setText(value);
} }
private void setupCover(Book book) { private void setupCover(Book book, PluginCollection pluginCollection) {
final ImageView coverView = (ImageView)findViewById(R.id.book_cover); final ImageView coverView = (ImageView)findViewById(R.id.book_cover);
coverView.setVisibility(View.GONE); coverView.setVisibility(View.GONE);
coverView.setImageDrawable(null); coverView.setImageDrawable(null);
final ZLImage image = CoverUtil.getCover(book, PluginCollection.Instance(Paths.systemInfo(this))); final ZLImage image = CoverUtil.getCover(book, pluginCollection);
if (image == null) { if (image == null) {
return; return;

6
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -333,12 +333,14 @@ public final class FBReaderApp extends ZLApplication {
System.gc(); System.gc();
final PluginCollection pluginCollection = PluginCollection.Instance(SystemInfo); final PluginCollection pluginCollection = PluginCollection.Instance(SystemInfo);
FormatPlugin plugin = null; final FormatPlugin plugin;
try { try {
plugin = BookUtil.getPlugin(pluginCollection, book); plugin = BookUtil.getPlugin(pluginCollection, book);
} catch (BookReadingException e) { } catch (BookReadingException e) {
// ignore processException(e);
return;
} }
if (plugin instanceof ExternalFormatPlugin) { if (plugin instanceof ExternalFormatPlugin) {
ExternalBook = book; ExternalBook = book;
final Bookmark bm; final Bookmark bm;