diff options
| author | Vincent <valodim@mugenguild.com> | 2016-03-10 19:43:05 +0100 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-03-10 19:43:05 +0100 |
| commit | 81e46a7bc3cbed48ab3b7d4267314f55c2fef968 (patch) | |
| tree | d6c9c3069aeffc317b5e3ac5d107ba79eb6560d5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | |
| parent | 69e6e404bf77305c80511bbc904734655cd8865c (diff) | |
| parent | b4ea59bf7cfec8f505622dd80903d2f8a4461570 (diff) | |
| download | open-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/KeychainProvider.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java index 0cb8e4675..9fbee0a67 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -308,6 +308,9 @@ public class KeychainProvider extends ContentProvider { projectionMap.put(KeyRings.ALGORITHM, Tables.KEYS + "." + Keys.ALGORITHM); projectionMap.put(KeyRings.FINGERPRINT, Tables.KEYS + "." + Keys.FINGERPRINT); projectionMap.put(KeyRings.USER_ID, Tables.USER_PACKETS + "." + UserPackets.USER_ID); + projectionMap.put(KeyRings.NAME, Tables.USER_PACKETS + "." + UserPackets.NAME); + projectionMap.put(KeyRings.EMAIL, Tables.USER_PACKETS + "." + UserPackets.EMAIL); + projectionMap.put(KeyRings.COMMENT, Tables.USER_PACKETS + "." + UserPackets.COMMENT); projectionMap.put(KeyRings.HAS_DUPLICATE_USER_ID, "(EXISTS (SELECT * FROM " + Tables.USER_PACKETS + " AS dups" + " WHERE dups." + UserPackets.MASTER_KEY_ID |