LibraryActivity uses BookCollectionShadow

src/org/geometerplus/android/fbreader/library/LibraryActivity.java

@@ -41,7 +41,7 @@ import org.geometerplus.fbreader.tree.FBTree;
 
 import org.geometerplus.android.util.UIUtil;
 import org.geometerplus.android.fbreader.*;
-import org.geometerplus.android.fbreader.libraryService.SQLiteBooksDatabase;
+import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
 import org.geometerplus.android.fbreader.tree.TreeActivity;
 
 public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItemClickListener, View.OnCreateContextMenuListener, Library.ChangeListener {
@@ -57,14 +57,8 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
 		super.onCreate(icicle);
 
 		if (myLibrary == null) {
-			BooksDatabase db = SQLiteBooksDatabase.Instance();
+			myLibrary = new Library(new BookCollectionShadow(this));
-			if (db == null) {
-				db = new SQLiteBooksDatabase(this, "LIBRARY");
-			}
-			final BookCollection collection = new BookCollection(db);
-			myLibrary = new Library(collection);
 			myLibrary.addChangeListener(this);
-			collection.startBuild();
 		}
 
 		mySelectedBook =
@@ -78,6 +72,16 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
 		getListView().setOnCreateContextMenuListener(this);
 	}
 
+	@Override
+	protected void onStart() {
+		super.onStart();
+		((BookCollectionShadow)myLibrary.Collection).bindToService(new Runnable() {
+			public void run() {
+				myLibrary.init();
+			}
+		});
+	}
+
 	@Override
 	protected void onNewIntent(Intent intent) {
 		if (START_SEARCH_ACTION.equals(intent.getAction())) {
@@ -102,6 +106,12 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem
 		return key != null ? myLibrary.getLibraryTree(key) : myLibrary.getRootTree();
 	}
 
+	@Override
+	protected void onStop() {
+		((BookCollectionShadow)myLibrary.Collection).unbind();
+		super.onStop();
+	}
+
 	@Override
 	protected void onDestroy() {
 		myLibrary.removeChangeListener(this);

src/org/geometerplus/android/fbreader/libraryService/LibraryService.java

@@ -82,11 +82,7 @@ public class LibraryService extends Service {
 		private final List<FileObserver> myFileObservers = new LinkedList<FileObserver>();
 
 		LibraryImplementation() {
-			BooksDatabase database = SQLiteBooksDatabase.Instance();
+			myCollection = new BookCollection(SQLiteBooksDatabase.Instance(LibraryService.this));
-			if (database == null) {
-				database = new SQLiteBooksDatabase(LibraryService.this, "LIBRARY SERVICE");
-			}
-			myCollection = new BookCollection(database);
 			for (String path : myCollection.bookDirectories()) {
 				final Observer observer = new Observer(path);
 				observer.startWatching();

src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java

@@ -37,17 +37,23 @@ import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
 
 import org.geometerplus.fbreader.book.*;
 
-import org.geometerplus.android.util.UIUtil;
 import org.geometerplus.android.util.SQLiteUtil;
 
-public final class SQLiteBooksDatabase extends BooksDatabase {
+final class SQLiteBooksDatabase extends BooksDatabase {
-	private final String myInstanceId;
+	private static BooksDatabase ourInstance;
+
+	static BooksDatabase Instance(Context context) {
+		if (ourInstance == null) {
+			ourInstance = new SQLiteBooksDatabase(context);
+		}
+		return ourInstance;
+	}
+
 	private final SQLiteDatabase myDatabase;
 
-	public SQLiteBooksDatabase(Context context, String instanceId) {
+	private SQLiteBooksDatabase(Context context) {
-		myInstanceId = instanceId;
 		myDatabase = context.openOrCreateDatabase("books.db", Context.MODE_PRIVATE, null);
-		migrate(context);
+		migrate();
 	}
 
 	protected void executeAsATransaction(Runnable actions) {
@@ -69,14 +75,12 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
 		}
 	}
 
-	private void migrate(Context context) {
+	private void migrate() {
 		final int version = myDatabase.getVersion();
 		final int currentVersion = 20;
 		if (version >= currentVersion) {
 			return;
 		}
-		UIUtil.wait(version == 0 ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() {
-			public void run() {
 		myDatabase.beginTransaction();
 
 		switch (myDatabase.getVersion()) {
@@ -127,8 +131,6 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
 
 		myDatabase.execSQL("VACUUM");
 	}
-		}, context);
-	}
 
 	@Override
 	protected Book loadBook(long bookId) {

src/org/geometerplus/fbreader/book/BookCollection.java

@@ -35,6 +35,7 @@ public class BookCollection extends AbstractBookCollection {
 		Collections.synchronizedMap(new LinkedHashMap<ZLFile,Book>());
 	private final Map<Long,Book> myBooksById =
 		Collections.synchronizedMap(new HashMap<Long,Book>());
+
 	private static enum BuildStatus {
 		NotStarted,
 		Started,
@@ -264,7 +265,7 @@ public class BookCollection extends AbstractBookCollection {
 				}
 			}
 		};
-		builder.setPriority((Thread.MIN_PRIORITY + Thread.NORM_PRIORITY) / 2);
+		builder.setPriority(Thread.MIN_PRIORITY);
 		builder.start();
 	}
 

src/org/geometerplus/fbreader/book/BooksDatabase.java

@@ -26,16 +26,6 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.text.view.ZLTextPosition;
 
 public abstract class BooksDatabase {
-	private static BooksDatabase ourInstance;
-
-	public static BooksDatabase Instance() {
-		return ourInstance;
-	}
-
-	protected BooksDatabase() {
-		ourInstance = this;
-	}
-
 	protected Book createBook(long id, long fileId, String title, String encoding, String language) {
 		final FileInfoSet infos = new FileInfoSet(this, fileId);
 		return createBook(id, infos.getFile(fileId), title, encoding, language);

src/org/geometerplus/fbreader/library/Library.java

@@ -113,12 +113,6 @@ public final class Library {
 				switch (event) {
 					case Started:
 						Library.this.fireModelChangedEvent(ChangeListener.Code.StatusChanged);
-						for (Book book : Collection.recentBooks()) {
-							new BookTree(getFirstLevelTree(ROOT_RECENT), book, true);
-						}
-						for (Book book : Collection.favorites()) {
-							new BookTree(getFirstLevelTree(ROOT_FAVORITES), book, true);
-						}
 						setStatus(myStatusMask | STATUS_LOADING);
 						break;
 					case Completed:
@@ -137,6 +131,15 @@ public final class Library {
 		new FileFirstLevelTree(collection, myRootTree, ROOT_FILE_TREE);
 	}
 
+	public void init() {
+		for (Book book : Collection.recentBooks()) {
+			new BookTree(getFirstLevelTree(ROOT_RECENT), book, true);
+		}
+		for (Book book : Collection.favorites()) {
+			new BookTree(getFirstLevelTree(ROOT_FAVORITES), book, true);
+		}
+	}
+
 	public LibraryTree getRootTree() {
 		return myRootTree;
 	}