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

a merge

Browse source
This commit is contained in:
Nikolay Pultsin 2010-12-15 17:43:56 +03:00
parent 829c475bf4
commit 77dc29ead8
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,17 +241,10 @@ abstract class LibraryBaseActivity extends ListActivity {
openBook(book);
return true;
case ADD_TO_FAVORITES_ITEM_ID:
<<<<<<< HEAD
LibraryInstance.addBookToFavorites(bookTree.Book);
return true;
case REMOVE_FROM_FAVORITES_ITEM_ID:
LibraryInstance.removeBookFromFavorites(bookTree.Book);
=======
Library.addBookToFavorites(book);
return true;
case REMOVE_FROM_FAVORITES_ITEM_ID:
Library.removeBookFromFavorites(book);
>>>>>>> master
getListView().invalidateViews();
return true;
case DELETE_BOOK_ITEM_ID: