diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-24 11:35:59 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-24 11:35:59 +0200 |
| commit | 38823b73a31ae0fb82d7e385c141f1170127c4dd (patch) | |
| tree | fec3fd3ac257d1755388d021dbf0d48133dee40e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper | |
| parent | 9e7e0be82cafc6dc98bbc31099ce0efc36a789a0 (diff) | |
| parent | c865de4002a9751928969ef30a3a5a6f943249cc (diff) | |
| download | open-keychain-38823b73a31ae0fb82d7e385c141f1170127c4dd.tar.gz open-keychain-38823b73a31ae0fb82d7e385c141f1170127c4dd.tar.bz2 open-keychain-38823b73a31ae0fb82d7e385c141f1170127c4dd.zip | |
Merge branch 'master' into improve-file-more
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java index 80f52f914..5d281d5b0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java @@ -57,11 +57,13 @@ public class EmailKeyHelper { } } - // Most users don't have the SRV record, so ask a default server as well - String[] servers = Preferences.getPreferences(context).getKeyServers(); - if (servers != null && servers.length != 0) { - HkpKeyserver hkp = new HkpKeyserver(servers[0]); - keys.addAll(getEmailKeys(mail, hkp)); + if (keys.isEmpty()) { + // Most users don't have the SRV record, so ask a default server as well + String[] servers = Preferences.getPreferences(context).getKeyServers(); + if (servers != null && servers.length != 0) { + HkpKeyserver hkp = new HkpKeyserver(servers[0]); + keys.addAll(getEmailKeys(mail, hkp)); + } } return new ArrayList<ImportKeysListEntry>(keys); } |