diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:45:21 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:45:21 +0200 |
| commit | 270c7ffa1fb3c796449eac832e6d4795b6e40fd3 (patch) | |
| tree | aa90aa34fe5d294eaa19954c5222841bae3c06ed /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
| parent | 098823bd525bdbf215060dba1ed248af853bbfac (diff) | |
| parent | 34fca975d764cfdda61ae30c31fbb0ce81807df6 (diff) | |
| download | open-keychain-270c7ffa1fb3c796449eac832e6d4795b6e40fd3.tar.gz open-keychain-270c7ffa1fb3c796449eac832e6d4795b6e40fd3.tar.bz2 open-keychain-270c7ffa1fb3c796449eac832e6d4795b6e40fd3.zip | |
Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into Valodim-db-overhaul
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index fa673f695..e6e6ba31b 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -66,7 +66,7 @@ public class OpenPgpService extends RemoteService { ArrayList<String> dublicateUserIds = new ArrayList<String>(); for (String email : encryptionUserIds) { - Uri uri = KeychainContract.KeyRings.buildPublicKeyRingsByEmailsUri(email); + Uri uri = KeychainContract.KeyRings.buildUnifiedKeyRingsByEmailUri(email); Cursor cur = getContentResolver().query(uri, null, null, null, null); if (cur.moveToFirst()) { long id = cur.getLong(cur.getColumnIndex(KeychainContract.KeyRings.MASTER_KEY_ID)); |