diff options
| author | Vincent <valodim@mugenguild.com> | 2016-03-15 23:40:09 +0100 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-03-15 23:40:09 +0100 |
| commit | 5abbe859ff3f5a773d494f6a0ccf1c21691d6999 (patch) | |
| tree | d5880b6625c4356cb4c0fe88fb26d39c719fc552 /OpenKeychain | |
| parent | eb5eb95a9ffb0f340c85c0710b451a5895988e21 (diff) | |
| parent | 6087b0a6e048dbc4cfeae6d71e825ece6253994e (diff) | |
| download | open-keychain-5abbe859ff3f5a773d494f6a0ccf1c21691d6999.tar.gz open-keychain-5abbe859ff3f5a773d494f6a0ccf1c21691d6999.tar.bz2 open-keychain-5abbe859ff3f5a773d494f6a0ccf1c21691d6999.zip | |
Merge pull request #1777 from fjodorver/master
Updated HAS_DUPLICATE_USER_ID in KeychainProvider #1745
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | 4 |
1 files changed, 2 insertions, 2 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 9fbee0a67..e6789bc7b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -316,8 +316,8 @@ public class KeychainProvider extends ContentProvider { + " WHERE dups." + UserPackets.MASTER_KEY_ID + " != " + Tables.KEYS + "." + Keys.MASTER_KEY_ID + " AND dups." + UserPackets.RANK + " = 0" - + " AND dups." + UserPackets.USER_ID - + " = "+ Tables.USER_PACKETS + "." + UserPackets.USER_ID + + " AND dups." + UserPackets.NAME + " = "+ Tables.USER_PACKETS + "." + UserPackets.NAME + + " AND dups." + UserPackets.EMAIL + " = "+ Tables.USER_PACKETS + "." + UserPackets.EMAIL + ")) AS " + KeyRings.HAS_DUPLICATE_USER_ID); projectionMap.put(KeyRings.VERIFIED, Tables.CERTS + "." + Certs.VERIFIED); projectionMap.put(KeyRings.PUBKEY_DATA, |