library loading in background

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

@@ -44,7 +44,7 @@ import org.geometerplus.android.fbreader.FBReader;
 import org.geometerplus.android.fbreader.tree.BaseActivity;
 import org.geometerplus.android.fbreader.tree.ListAdapter;
 
-public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItemClickListener, View.OnCreateContextMenuListener {
+public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItemClickListener, View.OnCreateContextMenuListener, Library.ChangeListener {
 	public static final String SELECTED_BOOK_PATH_KEY = "SelectedBookPath";
 
 	static Library LibraryInstance;
@@ -65,6 +65,7 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
 			LibraryInstance = new Library();
 			startService(new Intent(getApplicationContext(), InitializationService.class));
 		}
+		LibraryInstance.addChangeListener(this);
 
 		final String selectedBookPath = getIntent().getStringExtra(SELECTED_BOOK_PATH_KEY);
 		mySelectedBook = null;
@@ -90,7 +91,10 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
 
 	@Override
 	protected void onDestroy() {
+		if (LibraryInstance != null) {
+			LibraryInstance.removeChangeListener(this);
 			LibraryInstance = null;
+		}
 		super.onDestroy();
 	}
 
@@ -318,4 +322,13 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
 		}
 		getListView().invalidateViews();
 	}
+
+	public void onLibraryChanged() {
+		runOnUiThread(new Runnable() {
+			public void run() {
+				getListAdapter().replaceAll(getCurrentTree().subTrees());
+				setProgressBarIndeterminateVisibility(!LibraryInstance.isSynchronized());
+			}
+		});
+	}
 }

src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java

@@ -72,8 +72,6 @@ public class NetworkBaseActivity extends BaseActivity implements NetworkView.Eve
 
 		OLD_STYLE_FLAG = true;
 
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
 		SQLiteCookieDatabase.init(this);
 
 		Connection = new BookDownloaderServiceConnection();

src/org/geometerplus/android/fbreader/tree/BaseActivity.java

@@ -24,8 +24,7 @@ import java.util.ArrayList;
 import android.app.ListActivity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.KeyEvent;
+import android.view.*;
-import android.view.View;
 
 import org.geometerplus.android.util.UIUtil;
 
@@ -48,6 +47,7 @@ public abstract class BaseActivity extends ListActivity {
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 		Thread.setDefaultUncaughtExceptionHandler(new org.geometerplus.zlibrary.ui.android.library.UncaughtExceptionHandler(this));
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 	}
 
 	@Override

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

@@ -60,24 +60,6 @@ public class FirstLevelTree extends LibraryTree {
 		return myId;
 	}
 
-	@Override
-	public Status getOpeningStatus() {
-		return
-			myLibrary.hasState(Library.STATE_FULLY_INITIALIZED)
-				? Status.READY_TO_OPEN
-				: Status.WAIT_FOR_OPEN;
-	}
-
-	@Override
-	public String getOpeningStatusMessage() {
-		return "loadingBookList";
-	}
-
-	@Override
-	public void waitForOpening() {
-		myLibrary.waitForState(Library.STATE_FULLY_INITIALIZED);
-	}
-
 	@Override
 	public boolean isSelectable() {
 		return false;

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

@@ -34,8 +34,9 @@ import org.geometerplus.fbreader.formats.PluginCollection;
 import org.geometerplus.fbreader.Paths;
 
 public final class Library {
-	static final int STATE_NOT_INITIALIZED = 0;
+	public interface ChangeListener {
-	static final int STATE_FULLY_INITIALIZED = 1;
+		void onLibraryChanged();
+	}
 
 	public static final String ROOT_FAVORITES = "favorites";
 	public static final String ROOT_SEARCH_RESULTS = "searchResults";
@@ -53,8 +54,8 @@ public final class Library {
 	private final RootTree myRootTree = new RootTree(this);
 	private boolean myDoGroupTitlesByFirstLetter;
 
-	private volatile int myState = STATE_NOT_INITIALIZED;
+	private final List<ChangeListener> myListeners = new LinkedList<ChangeListener>();
-	private volatile boolean myInterrupted = false;
+	private volatile boolean myIsSynchronized = false;
 
 	public Library() {
 		new FavoritesTree(myRootTree, ROOT_FAVORITES);
@@ -73,6 +74,14 @@ public final class Library {
 		return (FirstLevelTree)myRootTree.getSubTree(key);
 	}
 
+	public synchronized void addChangeListener(ChangeListener listener) {
+		myListeners.add(listener);
+	}
+
+	public synchronized void removeChangeListener(ChangeListener listener) {
+		myListeners.remove(listener);
+	}
+
 	public LibraryTree getLibraryTree(LibraryTree.Key key) {
 		if (key == null) {
 			return null;
@@ -84,23 +93,6 @@ public final class Library {
 		return parentTree != null ? (LibraryTree)parentTree.getSubTree(key.Id) : null;
 	}
 
-	boolean hasState(int state) {
-		return myState >= state || myInterrupted;
-	}
-
-	void waitForState(int state) {
-		while (myState < state && !myInterrupted) {
-			synchronized (this) {
-				if (myState < state && !myInterrupted) {
-					try {
-						wait();
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-		}
-	}
-
 	public static ZLResourceFile getHelpFile() {
 		final Locale locale = Locale.getDefault();
 
@@ -271,8 +263,10 @@ public final class Library {
 		}
 	}
 
-	private void fireModelChangedEvent() {
+	private synchronized void fireModelChangedEvent() {
-		System.err.println("model changed event");
+		for (ChangeListener l : myListeners) {
+			l.onLibraryChanged();
+		}
 	}
 
 	private void build() {
@@ -384,30 +378,26 @@ public final class Library {
 			}
 		});
 		db.setExistingFlag(newBooks, true);
-
-		myState = STATE_FULLY_INITIALIZED;
 	}
 
-	public synchronized void synchronize() {
+	public void synchronize() {
-		if (myState == STATE_NOT_INITIALIZED) {
-			try {
-				myInterrupted = false;
 		build();
-			} catch (Throwable t) {
+		myIsSynchronized = true;
-				myInterrupted = true;
+		fireModelChangedEvent();
-			}
-			notifyAll();
 	}
+
+	public boolean isSynchronized() {
+		return myIsSynchronized;
 	}
 
 	public static Book getRecentBook() {
 		List<Long> recentIds = BooksDatabase.Instance().loadRecentBookIds();
-		return (recentIds.size() > 0) ? Book.getById(recentIds.get(0)) : null;
+		return recentIds.size() > 0 ? Book.getById(recentIds.get(0)) : null;
 	}
 
 	public static Book getPreviousBook() {
 		List<Long> recentIds = BooksDatabase.Instance().loadRecentBookIds();
-		return (recentIds.size() > 1) ? Book.getById(recentIds.get(1)) : null;
+		return recentIds.size() > 1 ? Book.getById(recentIds.get(1)) : null;
 	}
 
 	private FirstLevelTree createNewSearchResults(String pattern) {
@@ -419,7 +409,6 @@ public final class Library {
 	}
 
 	public LibraryTree searchBooks(String pattern) {
-		waitForState(STATE_FULLY_INITIALIZED);
 		FirstLevelTree newSearchResults = null;
 		if (pattern != null) {
 			pattern = pattern.toLowerCase();
@@ -451,7 +440,6 @@ public final class Library {
 		if (book == null) {
 			return false;
 		}
-		waitForState(STATE_FULLY_INITIALIZED);
 		final LibraryTree rootFavorites = getFirstLevelTree(ROOT_FAVORITES);
 		for (FBTree tree : rootFavorites.subTrees()) {
 			if (tree instanceof BookTree && book.equals(((BookTree)tree).Book)) {
@@ -462,7 +450,6 @@ public final class Library {
 	}
 
 	public void addBookToFavorites(Book book) {
-		waitForState(STATE_FULLY_INITIALIZED);
 		if (isBookInFavorites(book)) {
 			return;
 		}
@@ -472,7 +459,6 @@ public final class Library {
 	}
 
 	public void removeBookFromFavorites(Book book) {
-		waitForState(STATE_FULLY_INITIALIZED);
 		if (getFirstLevelTree(ROOT_FAVORITES).removeBook(book)) {
 			BooksDatabase.Instance().removeFromFavorites(book.getId());
 		}
@@ -484,7 +470,6 @@ public final class Library {
 	public static final int REMOVE_FROM_LIBRARY_AND_DISK = REMOVE_FROM_LIBRARY | REMOVE_FROM_DISK;
 
 	public int getRemoveBookMode(Book book) {
-		waitForState(STATE_FULLY_INITIALIZED);
 		return canDeleteBookFile(book) ? REMOVE_FROM_DISK : REMOVE_DONT_REMOVE;
 	}
 
@@ -506,7 +491,6 @@ public final class Library {
 		if (removeMode == REMOVE_DONT_REMOVE) {
 			return;
 		}
-		waitForState(STATE_FULLY_INITIALIZED);
 		myBooks.remove(book);
 		if (getFirstLevelTree(ROOT_RECENT).removeBook(book)) {
 			final BooksDatabase db = BooksDatabase.Instance();