version => 2.0.6

Author: geometer

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.geometerplus.zlibrary.ui.android"
-		android:versionCode="2000513"
-		android:versionName="2.0.5.3"
+		android:versionCode="2000610"
+		android:versionName="2.0.6"
 		android:installLocation="auto"
 >
 	<uses-sdk

ChangeLog

@@ -4,6 +4,7 @@
 * Fixed possible synchornisation crashes
 * Fixed look for empty sync catalog
 * Fixed work with files with ':' in name
+* Fixed using of books DB after finish of service
 
 ===== 2.0.5 (Aug 18, 2014) =====
 * Fixed possible synchornisation crash

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

@@ -44,6 +44,9 @@
 import org.geometerplus.android.fbreader.util.AndroidImageSynchronizer;
 
 public class LibraryService extends Service {
+	private static SQLiteBooksDatabase ourDatabase;
+	private static final Object ourDatabaseLock = new Object();
+
 	static final String BOOK_EVENT_ACTION = "fbreader.library_service.book_event";
 	static final String BUILD_EVENT_ACTION = "fbreader.library_service.build_event";
 
@@ -96,8 +99,8 @@ public final class LibraryImplementation extends LibraryInterface.Stub {
 		private final List<FileObserver> myFileObservers = new LinkedList<FileObserver>();
 		private BookCollection myCollection;
 
-		LibraryImplementation() {
-			myDatabase = new SQLiteBooksDatabase(LibraryService.this);
+		LibraryImplementation(BooksDatabase db) {
+			myDatabase = db;
 			myCollection = new BookCollection(myDatabase, Paths.bookPath());
 			reset(true);
 		}
@@ -152,10 +155,6 @@ public void deactivate() {
 			}
 		}
 
-		public void close() {
-			((SQLiteBooksDatabase)myDatabase).close();
-		}
-
 		public String status() {
 			return myCollection.status().toString();
 		}
@@ -343,7 +342,12 @@ public IBinder onBind(Intent intent) {
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		myLibrary = new LibraryImplementation();
+		synchronized (ourDatabaseLock) {
+			if (ourDatabase == null) {
+				ourDatabase = new SQLiteBooksDatabase(LibraryService.this);
+			}
+		}
+		myLibrary = new LibraryImplementation(ourDatabase);
 	}
 
 	@Override
@@ -352,7 +356,6 @@ public void onDestroy() {
 			final LibraryImplementation l = myLibrary;
 			myLibrary = null;
 			l.deactivate();
-			l.close();
 		}
 		myImageSynchronizer.clear();
 		super.onDestroy();

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

@@ -50,7 +50,8 @@ final class SQLiteBooksDatabase extends BooksDatabase {
 		migrate();
 	}
 
-	public void close() {
+	@Override
+	public void finalize() {
 		myDatabase.close();
 	}