diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-08 04:24:27 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-08 04:24:27 +0200 |
commit | 16498be4a2c4b08b9763f21de4bc5670c89db4ee (patch) | |
tree | ed8ae99926c27aca4355333bbf1efc8b1a910833 /OpenKeychain/src | |
parent | 61d0e12e8ab5c5820186ab951e938479d853ab40 (diff) | |
download | open-keychain-16498be4a2c4b08b9763f21de4bc5670c89db4ee.tar.gz open-keychain-16498be4a2c4b08b9763f21de4bc5670c89db4ee.tar.bz2 open-keychain-16498be4a2c4b08b9763f21de4bc5670c89db4ee.zip |
Fix nullpointer in API, fix #693
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 17c277026..62d6b5ad6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -53,6 +53,12 @@ import java.util.Set; public class OpenPgpService extends RemoteService { + static final String[] KEYRING_PROJECTION = + new String[]{ + KeyRings._ID, + KeyRings.MASTER_KEY_ID, + }; + /** * Search database for key ids based on emails. * @@ -70,7 +76,7 @@ public class OpenPgpService extends RemoteService { for (String email : encryptionUserIds) { Uri uri = KeyRings.buildUnifiedKeyRingsFindByEmailUri(email); - Cursor cursor = getContentResolver().query(uri, null, null, null, null); + Cursor cursor = getContentResolver().query(uri, KEYRING_PROJECTION, null, null, null); try { if (cursor != null && cursor.moveToFirst()) { long id = cursor.getLong(cursor.getColumnIndex(KeyRings.MASTER_KEY_ID)); |