diff options
| author | fjodor <fedor@vershinin.net> | 2016-03-10 21:09:28 +0200 |
|---|---|---|
| committer | fjodor <fedor@vershinin.net> | 2016-03-10 21:26:55 +0200 |
| commit | 6087b0a6e048dbc4cfeae6d71e825ece6253994e (patch) | |
| tree | 9c640bb757c53960315aa03f429220c94642911f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | b4ea59bf7cfec8f505622dd80903d2f8a4461570 (diff) | |
| download | open-keychain-6087b0a6e048dbc4cfeae6d71e825ece6253994e.tar.gz open-keychain-6087b0a6e048dbc4cfeae6d71e825ece6253994e.tar.bz2 open-keychain-6087b0a6e048dbc4cfeae6d71e825ece6253994e.zip | |
Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email address instead of user id #1745
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
| -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, |