aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-05 19:58:30 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-05 19:58:30 +0100
commita41228fc06cedcddba23f7795a19cffaab2d05a7 (patch)
treefe47cb30259a805bfc9f2707fbb8b8e694b309a4
parentcf499462c5d4c24a7708195c4bf461f4c2203293 (diff)
downloadopen-keychain-a41228fc06cedcddba23f7795a19cffaab2d05a7.tar.gz
open-keychain-a41228fc06cedcddba23f7795a19cffaab2d05a7.tar.bz2
open-keychain-a41228fc06cedcddba23f7795a19cffaab2d05a7.zip
changelog
-rw-r--r--CHANGELOG3
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a5fb402bf..548dd1289 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2.3.1
+* hotfix for crash when upgrading from old versions
+
2.3
* remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
* fix setting expiry dates on keys (thanks to Ash Hughes)
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 212f77cd4..5f18ed6f9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -110,7 +110,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
Log.w(Constants.TAG, "Upgrading database from version " + oldVersion + " to " + newVersion);
- // Upgrade from oldVersion through all methods to newest one
+ // Upgrade from oldVersion through all cases to newest one
for (int version = oldVersion; version < newVersion; ++version) {
Log.w(Constants.TAG, "Upgrading database to version " + version);