cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.0 beta3

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-30 17:50:16 +02:00
parent 51ecce510f
commit b1b16b9313
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
View File

@@ -54,7 +54,7 @@ import java.io.IOException;
*/
public class KeychainDatabase extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "openkeychain.db";
private static final int DATABASE_VERSION = 5;
private static final int DATABASE_VERSION = 6;
static Boolean apgHack = false;
private Context mContext;
@@ -215,7 +215,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
// add has_secret for all who are upgrading from a beta version
try {
db.execSQL("ALTER TABLE keys ADD COLUMN has_secret BOOLEAN");
} catch (Exception e){
} catch (Exception e) {
// never mind, the column probably already existed
}
// fall through
@@ -223,7 +223,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
// ECC support
try {
db.execSQL("ALTER TABLE keys ADD COLUMN key_curve_oid TEXT");
} catch (Exception e){
} catch (Exception e) {
// never mind, the column probably already existed
}
// fall through
@@ -233,10 +233,13 @@ public class KeychainDatabase extends SQLiteOpenHelper {
case 4:
try {
db.execSQL("ALTER TABLE keys ADD COLUMN can_authenticate BOOLEAN");
} catch (Exception e){
} catch (Exception e) {
// never mind, the column probably already existed
}
// fall through
case 5:
// do consolidate for 3.0 beta3
// fall through
}
// always do consolidate after upgrade