diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-30 17:50:16 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-30 17:50:16 +0200 |
| commit | b1b16b93130dcb8ed06747fff7555c249bdebbf6 (patch) | |
| tree | 2efce3931d5c53356b39a020249759dc0ee13de3 /OpenKeychain | |
| parent | 51ecce510fc18ba8299effa971100ce93e9f7780 (diff) | |
| download | open-keychain-b1b16b93130dcb8ed06747fff7555c249bdebbf6.tar.gz open-keychain-b1b16b93130dcb8ed06747fff7555c249bdebbf6.tar.bz2 open-keychain-b1b16b93130dcb8ed06747fff7555c249bdebbf6.zip | |
3.0 beta3
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 0093b6f5b..c8b11f936 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -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 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java index 3da288c86..fe118d05a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -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 |