mirror of
https://github.com/geometer/FBReaderJ.git
synced 2025-10-04 02:09:35 +02:00
Merge branch 'master' into library-service
Conflicts: src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java src/org/geometerplus/fbreader/book/BooksDatabase.java
This commit is contained in:
commit
489b9a6ade
7 changed files with 11 additions and 11 deletions
|
@ -56,7 +56,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
|
|||
migrate();
|
||||
}
|
||||
|
||||
protected void executeAsATransaction(Runnable actions) {
|
||||
protected void executeAsTransaction(Runnable actions) {
|
||||
boolean transactionStarted = false;
|
||||
try {
|
||||
myDatabase.beginTransaction();
|
||||
|
@ -671,7 +671,7 @@ final class SQLiteBooksDatabase extends BooksDatabase {
|
|||
"INSERT OR IGNORE INTO RecentBooks (book_id) VALUES (?)"
|
||||
);
|
||||
}
|
||||
executeAsATransaction(new Runnable() {
|
||||
executeAsTransaction(new Runnable() {
|
||||
public void run() {
|
||||
myDatabase.delete("RecentBooks", null, null);
|
||||
for (long id : ids) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue