diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c4f8395b8..62d2ea4a0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/VERSION b/VERSION index 0664a8fd2..2bf1ca5f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.6 +1.1.7 diff --git a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java index cbb7392bf..d225f7ea5 100644 --- a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java +++ b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java @@ -50,13 +50,21 @@ public final class SQLiteBooksDatabase extends BooksDatabase { } protected void executeAsATransaction(Runnable actions) { - myDatabase.execSQL("BEGIN IMMEDIATE"); + boolean transactionStarted = false; + try { + myDatabase.beginTransaction(); + transactionStarted = true; + } catch (Throwable t) { + } try { actions.run(); - } catch (Throwable t) { - myDatabase.execSQL("ROLLBACK"); + if (transactionStarted) { + myDatabase.setTransactionSuccessful(); + } } finally { - myDatabase.execSQL("END"); + if (transactionStarted) { + myDatabase.endTransaction(); + } } }