1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 21:22:26 -05:00

Merge branch 'pullreq150'

This commit is contained in:
cketti 2012-07-07 17:04:17 +02:00
commit 400487b8aa

View File

@ -156,6 +156,8 @@ public class LocalStore extends Store implements Serializable {
AttachmentProvider.clear(mApplication); AttachmentProvider.clear(mApplication);
db.beginTransaction();
try {
try { try {
// schema version 29 was when we moved to incremental updates // schema version 29 was when we moved to incremental updates
// in the case of a new db or a < v29 db, we blow away and start from scratch // in the case of a new db or a < v29 db, we blow away and start from scratch
@ -385,6 +387,11 @@ public class LocalStore extends Store implements Serializable {
throw new Error("Database upgrade failed!"); throw new Error("Database upgrade failed!");
} }
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
// Unless we're blowing away the whole data store, there's no reason to prune attachments // Unless we're blowing away the whole data store, there's no reason to prune attachments
// every time the user upgrades. it'll just cost them money and pain. // every time the user upgrades. it'll just cost them money and pain.
// try // try