From 20c6effd3394c517b69f573e13cb3b512820a8b6 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Thu, 6 Aug 2015 13:37:57 +0200
Subject: [PATCH] minor cleanups

---
 .../android/fbreader/library/BookInfoActivity.java          | 6 +++---
 src/org/geometerplus/fbreader/fbreader/FBReaderApp.java     | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
index 17462de44..f0c91120e 100644
--- a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
+++ b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
@@ -100,7 +100,7 @@ public class BookInfoActivity extends Activity implements IBookCollection.Listen
 			// we force language & encoding detection
 			BookUtil.getEncoding(myBook, pluginCollection);
 
-			setupCover(myBook);
+			setupCover(myBook, pluginCollection);
 			setupBookInfo(myBook);
 			setupAnnotation(myBook, pluginCollection);
 			setupFileInfo(myBook);
@@ -186,13 +186,13 @@ public class BookInfoActivity extends Activity implements IBookCollection.Listen
 		((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);
 
 		coverView.setVisibility(View.GONE);
 		coverView.setImageDrawable(null);
 
-		final ZLImage image = CoverUtil.getCover(book, PluginCollection.Instance(Paths.systemInfo(this)));
+		final ZLImage image = CoverUtil.getCover(book, pluginCollection);
 
 		if (image == null) {
 			return;
diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
index 2e1653e30..efc9fbfe4 100644
--- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
+++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
@@ -333,12 +333,14 @@ public final class FBReaderApp extends ZLApplication {
 		System.gc();
 
 		final PluginCollection pluginCollection = PluginCollection.Instance(SystemInfo);
-		FormatPlugin plugin = null;
+		final FormatPlugin plugin;
 		try {
 			plugin = BookUtil.getPlugin(pluginCollection, book);
 		} catch (BookReadingException e) {
-			// ignore
+			processException(e);
+			return;
 		}
+
 		if (plugin instanceof ExternalFormatPlugin) {
 			ExternalBook = book;
 			final Bookmark bm;