diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:38:07 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:38:07 +0100 |
| commit | 8a4da8c1c386c15268dceaca60f5101594338c0a (patch) | |
| tree | 548a0a6707259d149d7b4ec618e67791e6b919e1 | |
| parent | b0cb0346c17d4f136cbcc3660ff173584fe2b9c7 (diff) | |
| parent | 79436044354651b3254000f102d14ccf1192b4b2 (diff) | |
| download | open-keychain-8a4da8c1c386c15268dceaca60f5101594338c0a.tar.gz open-keychain-8a4da8c1c386c15268dceaca60f5101594338c0a.tar.bz2 open-keychain-8a4da8c1c386c15268dceaca60f5101594338c0a.zip | |
Merge branch 'master' into v/decrypt-key-lookup
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 56081dab9..752c13007 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -74,14 +74,12 @@ public class KeychainDatabase extends SQLiteOpenHelper { "CREATE TABLE IF NOT EXISTS keyrings_public (" + KeyRingsColumns.MASTER_KEY_ID + " INTEGER PRIMARY KEY," + KeyRingsColumns.KEY_RING_DATA + " BLOB" - + "PRIMARY KEY(" + KeyRingsColumns.MASTER_KEY_ID + ")," + ")"; private static final String CREATE_KEYRINGS_SECRET = "CREATE TABLE IF NOT EXISTS keyrings_secret (" + KeyRingsColumns.MASTER_KEY_ID + " INTEGER PRIMARY KEY," - + KeyRingsColumns.KEY_RING_DATA + " BLOB," - + "PRIMARY KEY(" + KeyRingsColumns.MASTER_KEY_ID + ")," + + KeyRingsColumns.KEY_RING_DATA + " BLOB, " + "FOREIGN KEY(" + KeyRingsColumns.MASTER_KEY_ID + ") " + "REFERENCES keyrings_public(" + KeyRingsColumns.MASTER_KEY_ID + ") ON DELETE CASCADE" + ")"; |