From e7738a2a5cf486b35f9a96a6464ee61011d39886 Mon Sep 17 00:00:00 2001
From: Vasiliy Bout <bout.vasiliy@gmail.com>
Date: Tue, 14 Sep 2010 10:46:45 +0000
Subject: [PATCH] Minor bugfixes: external books from archives in the Library

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1743 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
---
 ChangeLog                                                 | 4 ++++
 .../android/fbreader/SQLiteBooksDatabase.java             | 8 +++++++-
 src/org/geometerplus/fbreader/fbreader/FBReader.java      | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4673e6464..c083862b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+===== 0.7.2 (??? ??, 2010) =====
+
+* Minor bugfixes
+
 ===== 0.7.1 (Sep 13, 2010) =====
 
 * Support for reading books from any folders (e.g. opening books via file-manager)
diff --git a/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
index 80850a67a..234dc7026 100644
--- a/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
+++ b/src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
@@ -58,7 +58,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 
 	private void migrate() {
 		final int version = myDatabase.getVersion();
-		final int currentVersion = 9;
+		final int currentVersion = 10;
 		if (version >= currentVersion) {
 			return;
 		}
@@ -85,6 +85,8 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 						updateTables7();
 					case 8:
 						updateTables8();
+					case 9:
+						updateTables9();
 				}
 				myDatabase.setTransactionSuccessful();
 				myDatabase.endTransaction();
@@ -1059,4 +1061,8 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 			"CREATE TABLE IF NOT EXISTS BookList ( " +
 				"book_id INTEGER UNIQUE NOT NULL REFERENCES Books (book_id))");
 	}
+
+	private void updateTables9() {
+		myDatabase.execSQL("CREATE INDEX BookList_BookIndex ON BookList (book_id)");
+	}
 }
diff --git a/src/org/geometerplus/fbreader/fbreader/FBReader.java b/src/org/geometerplus/fbreader/fbreader/FBReader.java
index f051b9b7f..a872dfc58 100644
--- a/src/org/geometerplus/fbreader/fbreader/FBReader.java
+++ b/src/org/geometerplus/fbreader/fbreader/FBReader.java
@@ -241,6 +241,7 @@ public final class FBReader extends ZLApplication {
 			for (ZLFile child : file.children()) {
 				book = Book.getByFile(child);
 				if (book != null) {
+					book.insertIntoBookList();
 					return book;
 				}
 			}