yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

Library constructor takes BooksDatabase

Browse source
This commit is contained in:
Nikolay Pultsin 2012-01-27 02:14:21 +00:00
parent d0326d4889
commit 277fe6cbeb
3 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
View file

@ -29,14 +29,23 @@ import org.geometerplus.android.fbreader.library.SQLiteBooksDatabase;
public class LibraryService extends Service implements Library.ChangeListener {
public final class LibraryImplementation extends LibraryInterface.Stub {
private final AbstractLibrary myBaseLibrary;
LibraryImplementation() {
BooksDatabase database = SQLiteBooksDatabase.Instance();
if (database == null) {
database = new SQLiteBooksDatabase(LibraryService.this, "LIBRARY SERVICE");
}
myBaseLibrary = new Library(database);
((Library)myBaseLibrary).startBuild();
}
public boolean isUpToDate() {
return myLibrary.isUpToDate();
return myBaseLibrary.isUpToDate();
}
}
private LibraryImplementation myImplementation;
private BooksDatabase myDatabase;
private AbstractLibrary myLibrary;
private LibraryImplementation myLibrary;
@Override
public void onStart(Intent intent, int startId) {
@ -53,29 +62,21 @@ public class LibraryService extends Service implements Library.ChangeListener {
@Override
public IBinder onBind(Intent intent) {
System.err.println("LibraryService binded for intent " + intent);
return myImplementation;
return myLibrary;
}
@Override
public void onCreate() {
System.err.println("LibraryService.onCreate()");
super.onCreate();
myDatabase = SQLiteBooksDatabase.Instance();
if (myDatabase == null) {
myDatabase = new SQLiteBooksDatabase(this, "LIBRARY SERVICE");
}
if (myLibrary == null) {
myLibrary = Library.Instance();
myLibrary.addChangeListener(this);
((Library)myLibrary).startBuild();
}
myImplementation = new LibraryImplementation();
myLibrary = new LibraryImplementation();
myLibrary.myBaseLibrary.addChangeListener(this);
}
@Override
public void onDestroy() {
System.err.println("LibraryService.onDestroy()");
myLibrary.removeChangeListener(this);
myLibrary.myBaseLibrary.removeChangeListener(this);
myLibrary = null;
super.onDestroy();
}