From b1b16b93130dcb8ed06747fff7555c249bdebbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 30 Sep 2014 17:50:16 +0200
Subject: 3.0 beta3

---
 OpenKeychain/src/main/AndroidManifest.xml                     |  4 ++--
 .../keychain/provider/KeychainDatabase.java                   | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src')

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
-- 
cgit v1.2.3