aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-09-09 12:59:53 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-09-09 12:59:53 +0200
commit5dc693c64c14000a3a03903736d000a45795bcee (patch)
treefc7653d46740579f73d69558fe2a745f6686cb83 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
parentc4bf7c5d1145c3a08211f31633d75c61bbb4bcb1 (diff)
downloadopen-keychain-5dc693c64c14000a3a03903736d000a45795bcee.tar.gz
open-keychain-5dc693c64c14000a3a03903736d000a45795bcee.tar.bz2
open-keychain-5dc693c64c14000a3a03903736d000a45795bcee.zip
Make asciiArmor a parameter, extend advanced app settings
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java13
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index be640df57..0f962967d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -64,14 +64,11 @@ public class KeychainDatabase extends SQLiteOpenHelper {
+ UserIdsColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "("
+ BaseColumns._ID + ") ON DELETE CASCADE)";
- private static final String CREATE_API_APPS = "CREATE TABLE IF NOT EXISTS "
- + Tables.API_APPS + " (" + BaseColumns._ID
- + " INTEGER PRIMARY KEY AUTOINCREMENT, " + ApiAppsColumns.PACKAGE_NAME
- + " TEXT UNIQUE, " + ApiAppsColumns.KEY_ID + " INT64, "
- + ApiAppsColumns.ASCII_ARMOR + " INTEGER, "
- + ApiAppsColumns.ENCRYPTION_ALGORITHM + " INTEGER, "
- + ApiAppsColumns.HASH_ALORITHM + " INTEGER, "
- + ApiAppsColumns.COMPRESSION + " INTEGER)";
+ private static final String CREATE_API_APPS = "CREATE TABLE IF NOT EXISTS " + Tables.API_APPS
+ + " (" + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+ + ApiAppsColumns.PACKAGE_NAME + " TEXT UNIQUE, " + ApiAppsColumns.KEY_ID + " INT64, "
+ + ApiAppsColumns.ENCRYPTION_ALGORITHM + " INTEGER, " + ApiAppsColumns.HASH_ALORITHM
+ + " INTEGER, " + ApiAppsColumns.COMPRESSION + " INTEGER)";
KeychainDatabase(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);