diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-06-23 22:02:18 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-06-23 22:02:18 +0200 |
| commit | 2b18dc741a11b9709eb91cc3a240aa0cfae6d56d (patch) | |
| tree | 96e874d53f00039f3bf6bd8a03d74a34b4e63a66 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java | |
| parent | 6c42fe58bd2f73966af8a98fd8920ca1762c77e8 (diff) | |
| download | open-keychain-2b18dc741a11b9709eb91cc3a240aa0cfae6d56d.tar.gz open-keychain-2b18dc741a11b9709eb91cc3a240aa0cfae6d56d.tar.bz2 open-keychain-2b18dc741a11b9709eb91cc3a240aa0cfae6d56d.zip | |
Switch to dnsjava
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java')
| -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); } |