From 30c3021fea22c27ff306ff87528fa80638fe887d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 29 Oct 2014 23:41:10 +0100 Subject: Always use INTEGER instead of BOOLEAN in database to avoid confusion --- .../keychain/provider/KeychainDatabase.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'OpenKeychain') 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 fe118d05a..84a50dc65 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -49,8 +49,6 @@ import java.io.IOException; * - REAL. The value is a floating point value, stored as an 8-byte IEEE floating point number. * - TEXT. The value is a text string, stored using the database encoding (UTF-8, UTF-16BE or UTF-16LE). * - BLOB. The value is a blob of data, stored exactly as it was input. - * - * Adding BOOLEAN results in an INTEGER, but we keep BOOLEAN to indicate the usage! */ public class KeychainDatabase extends SQLiteOpenHelper { private static final String DATABASE_NAME = "openkeychain.db"; @@ -93,12 +91,12 @@ public class KeychainDatabase extends SQLiteOpenHelper { + KeysColumns.ALGORITHM + " INTEGER, " + KeysColumns.FINGERPRINT + " BLOB, " - + KeysColumns.CAN_CERTIFY + " BOOLEAN, " - + KeysColumns.CAN_SIGN + " BOOLEAN, " - + KeysColumns.CAN_ENCRYPT + " BOOLEAN, " - + KeysColumns.CAN_AUTHENTICATE + " BOOLEAN, " - + KeysColumns.IS_REVOKED + " BOOLEAN, " - + KeysColumns.HAS_SECRET + " BOOLEAN, " + + KeysColumns.CAN_CERTIFY + " INTEGER, " + + KeysColumns.CAN_SIGN + " INTEGER, " + + KeysColumns.CAN_ENCRYPT + " INTEGER, " + + KeysColumns.CAN_AUTHENTICATE + " INTEGER, " + + KeysColumns.IS_REVOKED + " INTEGER, " + + KeysColumns.HAS_SECRET + " INTEGER, " + KeysColumns.CREATION + " INTEGER, " + KeysColumns.EXPIRY + " INTEGER, " @@ -113,8 +111,8 @@ public class KeychainDatabase extends SQLiteOpenHelper { + UserIdsColumns.MASTER_KEY_ID + " INTEGER, " + UserIdsColumns.USER_ID + " TEXT, " - + UserIdsColumns.IS_PRIMARY + " BOOLEAN, " - + UserIdsColumns.IS_REVOKED + " BOOLEAN, " + + UserIdsColumns.IS_PRIMARY + " INTEGER, " + + UserIdsColumns.IS_REVOKED + " INTEGER, " + UserIdsColumns.RANK+ " INTEGER, " + "PRIMARY KEY(" + UserIdsColumns.MASTER_KEY_ID + ", " + UserIdsColumns.USER_ID + "), " @@ -214,7 +212,7 @@ public class KeychainDatabase extends SQLiteOpenHelper { case 1: // add has_secret for all who are upgrading from a beta version try { - db.execSQL("ALTER TABLE keys ADD COLUMN has_secret BOOLEAN"); + db.execSQL("ALTER TABLE keys ADD COLUMN has_secret INTEGER"); } catch (Exception e) { // never mind, the column probably already existed } @@ -232,7 +230,7 @@ public class KeychainDatabase extends SQLiteOpenHelper { // fall through case 4: try { - db.execSQL("ALTER TABLE keys ADD COLUMN can_authenticate BOOLEAN"); + db.execSQL("ALTER TABLE keys ADD COLUMN can_authenticate INTEGER"); } catch (Exception e) { // never mind, the column probably already existed } -- cgit v1.2.3 From 26a4cf2a56bfabd01bc67517bf383351524a11df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 30 Oct 2014 12:48:06 +0100 Subject: Changelog 3.1.1 --- .../org/sufficientlysecure/keychain/provider/ProviderHelper.java | 2 +- OpenKeychain/src/main/res/raw/help_changelog.html | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index b18b919c3..05dc99c5e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -658,7 +658,7 @@ public class ProviderHelper { // first, mark all keys as not available ContentValues values = new ContentValues(); - values.put(Keys.HAS_SECRET, 0); + values.put(Keys.HAS_SECRET, SecretKeyType.UNAVAILABLE.getNum()); mContentResolver.update(uri, values, null, null); // then, mark exactly the keys we have available diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html index 4488b0605..c365ff7a3 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.html +++ b/OpenKeychain/src/main/res/raw/help_changelog.html @@ -6,6 +6,12 @@ And don't add newlines before or after p tags because of transifex --> +

3.1.1

+ +

3.1