aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
diff options
context:
space:
mode:
authorTim Bray <timbray@gmail.com>2014-09-12 08:34:51 -0700
committerTim Bray <timbray@gmail.com>2014-09-13 21:41:03 -0700
commit1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3 (patch)
tree6571fc5b6aca0de6bd23e9acda38caf16d81cc30 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
parent36ef8a9a62f32f0843c9e317d493a7f136624dce (diff)
downloadopen-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.tar.gz
open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.tar.bz2
open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.zip
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
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.java6
1 files changed, 3 insertions, 3 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 d8efdc480..91325ca1f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/EmailKeyHelper.java
@@ -61,9 +61,9 @@ public class EmailKeyHelper {
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]);
+ String server = Preferences.getPreferences(context).getPreferredKeyserver();
+ if (server != null) {
+ HkpKeyserver hkp = new HkpKeyserver(server);
keys.addAll(getEmailKeys(mail, hkp));
}
}