mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-24 07:58:50 -05:00
3.0 beta3
This commit is contained in:
parent
51ecce510f
commit
b1b16b9313
@ -3,8 +3,8 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="org.sufficientlysecure.keychain"
|
||||
android:installLocation="auto"
|
||||
android:versionCode="29202"
|
||||
android:versionName="3.0 beta2">
|
||||
android:versionCode="29203"
|
||||
android:versionName="3.0 beta3">
|
||||
|
||||
<!--
|
||||
General remarks
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user