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

Merge branch 'master' into file-manager

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/library/InitializationService.java
This commit is contained in:
Nikolay Pultsin 2010-12-15 22:09:31 +00:00
commit e09df754c6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/library/InitializationService.java
View file

@ -33,7 +33,7 @@ public class InitializationService extends Service {
public void onStart(Intent intent, int startId) {
final Thread libraryInitializer = new Thread(new Runnable() {
public void run() {
LibraryTopLevelActivity.LibraryInstance.synchronize();
LibraryBaseActivity.LibraryInstance.synchronize();
}
});
libraryInitializer.setPriority(Thread.MIN_PRIORITY);

6
src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java
View file

@ -249,10 +249,10 @@ abstract class LibraryBaseActivity extends ListActivity {
openBook(book);
return true;
case ADD_TO_FAVORITES_ITEM_ID:
Library.addBookToFavorites(book);
LibraryInstance.addBookToFavorites(book);
return true;
case REMOVE_FROM_FAVORITES_ITEM_ID:
Library.removeBookFromFavorites(book);
LibraryInstance.removeBookFromFavorites(book);
getListView().invalidateViews();
return true;
case DELETE_BOOK_ITEM_ID:
@ -273,7 +273,7 @@ abstract class LibraryBaseActivity extends ListActivity {
}
public void onClick(DialogInterface dialog, int which) {
Library.removeBook(myBook, myMode);
LibraryInstance.removeBook(myBook, myMode);
getListView().invalidateViews();
setResult(RESULT_DO_INVALIDATE_VIEWS);
}