From 32e122113aafe67ece1141da83b4f13e8f46f62c Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 2 Mar 2013 14:39:11 +0400
Subject: [PATCH] do not kill library service too often

---
 src/org/geometerplus/android/fbreader/FBReader.java   |  8 +++++++-
 .../android/fbreader/library/LibraryActivity.java     | 11 +----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java
index b1c846801..5fa977d58 100644
--- a/src/org/geometerplus/android/fbreader/FBReader.java
+++ b/src/org/geometerplus/android/fbreader/FBReader.java
@@ -183,6 +183,7 @@ public final class FBReader extends Activity {
 		if (myFBReaderApp == null) {
 			myFBReaderApp = new FBReaderApp(new BookCollectionShadow());
 		}
+		getCollection().bindToService(this, null);
 		myBook = null;
 
 		final ZLAndroidApplication androidApplication = (ZLAndroidApplication)getApplication();
@@ -454,10 +455,15 @@ public final class FBReader extends Activity {
 	protected void onStop() {
 		ApiServerImplementation.sendEvent(this, ApiListener.EVENT_READ_MODE_CLOSED);
 		PopupPanel.removeAllWindows(myFBReaderApp, this);
-		getCollection().unbind();
 		super.onStop();
 	}
 
+	@Override
+	protected void onDestroy() {
+		getCollection().unbind();
+		super.onDestroy();
+	}
+
 	@Override
 	public void onLowMemory() {
 		myFBReaderApp.onWindowClosing();
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java
index b55b1dbee..a16c4a32a 100644
--- a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java
@@ -68,11 +68,7 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
 
 		getListView().setTextFilterEnabled(true);
 		getListView().setOnCreateContextMenuListener(this);
-	}
 
-	@Override
-	protected void onStart() {
-		super.onStart();
 		((BookCollectionShadow)myRootTree.Collection).bindToService(this, new Runnable() {
 			public void run() {
 				setProgressBarIndeterminateVisibility(!myRootTree.Collection.status().IsCompleted);
@@ -102,15 +98,10 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
 		return key != null ? myRootTree.getLibraryTree(key) : myRootTree;
 	}
 
-	@Override
-	protected void onStop() {
-		((BookCollectionShadow)myRootTree.Collection).unbind();
-		super.onStop();
-	}
-
 	@Override
 	protected void onDestroy() {
 		myRootTree.Collection.removeListener(this);
+		((BookCollectionShadow)myRootTree.Collection).unbind();
 		super.onDestroy();
 	}