aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
diff options
context:
space:
mode:
authorVincent <valodim@mugenguild.com>2016-03-10 19:43:05 +0100
committerVincent <valodim@mugenguild.com>2016-03-10 19:43:05 +0100
commit81e46a7bc3cbed48ab3b7d4267314f55c2fef968 (patch)
treed6c9c3069aeffc317b5e3ac5d107ba79eb6560d5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
parent69e6e404bf77305c80511bbc904734655cd8865c (diff)
parentb4ea59bf7cfec8f505622dd80903d2f8a4461570 (diff)
downloadopen-keychain-81e46a7bc3cbed48ab3b7d4267314f55c2fef968.tar.gz
open-keychain-81e46a7bc3cbed48ab3b7d4267314f55c2fef968.tar.bz2
open-keychain-81e46a7bc3cbed48ab3b7d4267314f55c2fef968.zip
Merge pull request #1763 from fjodorver/master
WIP: Save split user ids in database #1745
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 177f07344..90a695547 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -60,6 +60,9 @@ public class KeychainContract {
String MASTER_KEY_ID = "master_key_id"; // foreign key to key_rings._ID
String TYPE = "type"; // not a database id
String USER_ID = "user_id"; // not a database id
+ String NAME = "name";
+ String EMAIL = "email";
+ String COMMENT = "comment";
String ATTRIBUTE_DATA = "attribute_data"; // not a database id
String RANK = "rank"; // ONLY used for sorting! no key, no nothing!
String IS_PRIMARY = "is_primary";
@@ -359,6 +362,9 @@ public class KeychainContract {
public static class Certs implements CertsColumns, BaseColumns {
public static final String USER_ID = UserPacketsColumns.USER_ID;
+ public static final String NAME = UserPacketsColumns.NAME;
+ public static final String EMAIL = UserPacketsColumns.EMAIL;
+ public static final String COMMENT = UserPacketsColumns.COMMENT;
public static final String SIGNER_UID = "signer_user_id";
public static final int UNVERIFIED = 0;