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

Merge branch 'master' into library-service

Browse source 
Conflicts:
	src/org/geometerplus/fbreader/book/BookCollection.java
This commit is contained in:
Nikolay Pultsin 2013-02-08 10:27:43 +00:00
commit be93250e6d
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/libraryService/LibraryInterface.aidl
View file

@ -10,8 +10,8 @@ import org.geometerplus.android.fbreader.api.TextPosition;
interface LibraryInterface { interface LibraryInterface {
int size(); int size();
List<String> books(); List<String> books();
List<String> booksForPattern(in String pattern);
List<String> booksForAuthor(in String author); List<String> booksForAuthor(in String author);
List<String> booksForPattern(in String pattern);
List<String> recentBooks(); List<String> recentBooks();
List<String> favorites(); List<String> favorites();
String getBookByFile(in String file); String getBookByFile(in String file);

1
src/org/geometerplus/fbreader/book/BookCollection.java
View file

@ -162,7 +162,6 @@ public class BookCollection extends AbstractBookCollection {
} else if (force) { } else if (force) {
existing.updateFrom(book); existing.updateFrom(book);
fireBookEvent(BookEvent.Updated, existing); fireBookEvent(BookEvent.Updated, existing);
getBookById(book.getId());
} }
} }
} }