yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

fixed database creation/updating: version will be checked & set inside transaction

Browse source
This commit is contained in:
Nikolay Pultsin 2012-10-10 15:24:40 +04:00
parent a6caf30618
commit bcee5c29cb
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,11 +75,11 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
if (version >= currentVersion) { if (version >= currentVersion) {
return; return;
} }
UIUtil.wait((version == 0) ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() { UIUtil.wait(version == 0 ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() {
public void run() { public void run() {
myDatabase.beginTransaction(); myDatabase.beginTransaction();
switch (version) { switch (myDatabase.getVersion()) {
case 0: case 0:
createTables(); createTables();
case 1: case 1:
@ -120,10 +120,10 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
updateTables18(); updateTables18();
} }
myDatabase.setTransactionSuccessful(); myDatabase.setTransactionSuccessful();
myDatabase.setVersion(currentVersion);
myDatabase.endTransaction(); myDatabase.endTransaction();
myDatabase.execSQL("VACUUM"); myDatabase.execSQL("VACUUM");
myDatabase.setVersion(currentVersion);
} }
}, context); }, context);
} }