moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-26 01:28:50 -05:00
Code Issues Releases Wiki Activity

Simplify database upgrade when adding 'notify_class' to 'folders'

Browse Source
This commit is contained in:
cketti 2014-09-04 22:48:13 +02:00
parent bd9efa8d01
commit 7edd1cb53c
1 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -701,31 +701,19 @@ public class LocalStore extends Store implements Serializable {
} }
if (db.getVersion() < 50) { if (db.getVersion() < 50) {
try { try {
db.execSQL("ALTER TABLE folders ADD notify_class TEXT"); db.execSQL("ALTER TABLE folders ADD notify_class TEXT default '" +
Folder.FolderClass.INHERITED.name() + "'");
} catch (SQLiteException e) { } catch (SQLiteException e) {
if (! e.getMessage().startsWith("duplicate column name:")) { if (! e.getMessage().startsWith("duplicate column name:")) {
throw e; throw e;
} }
} }
Cursor cursor = null; ContentValues cv = new ContentValues();
try { cv.put("notify_class", Folder.FolderClass.FIRST_CLASS.name());
SharedPreferences prefs = getPreferences();
cursor = db.rawQuery("SELECT id, name FROM folders", null); db.update("folders", cv, "name = ?",
while (cursor.moveToNext()) { new String[] { getAccount().getInboxFolderName() });
try {
int id = cursor.getInt(0);
String name = cursor.getString(1);
update50Metadata(db, prefs, id, name);
} catch (Exception e) {
Log.e(K9.LOG_TAG, " error trying to ugpgrade a folder notify class", e);
}
}
} catch (SQLiteException e) {
Log.e(K9.LOG_TAG, "Exception while upgrading database to v50. folder classes may have vanished", e);
} finally {
Utility.closeQuietly(cursor);
}
} }
} }
@ -781,29 +769,6 @@ public class LocalStore extends Store implements Serializable {
new Object[] { integrate, inTopGroup, syncClass, pushClass, displayClass, id }); new Object[] { integrate, inTopGroup, syncClass, pushClass, displayClass, id });
} }
private void update50Metadata(final SQLiteDatabase db, SharedPreferences prefs, int id, String name) {
Folder.FolderClass notifyClass = Folder.FolderClass.INHERITED;
if (mAccount.getInboxFolderName().equals(name)) {
notifyClass = Folder.FolderClass.FIRST_CLASS;
}
try {
notifyClass = Folder.FolderClass.valueOf(prefs.getString(uUid + "." + name + ".notifyMode", notifyClass.name()));
} catch (Exception e) {
Log.e(K9.LOG_TAG, " Throwing away an error while trying to upgrade folder metadata", e);
}
if (notifyClass == Folder.FolderClass.NONE) {
notifyClass = Folder.FolderClass.INHERITED;
}
db.execSQL("UPDATE folders SET notify_class=? WHERE id = ?",
new Object[] { notifyClass, id });
}
} }