diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-10 13:16:28 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-10 13:16:28 +0100 |
| commit | 1b141c61e15526d8a979c917b632bba91b77b859 (patch) | |
| tree | f7085ba8e0143e3c023c2ba3412fea8333f99ebc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java | |
| parent | a5d7a8ddf2c0fd03b386284bf0cdde9aba8dcee3 (diff) | |
| parent | f29280bbb268d112426c6662e1227118819fb904 (diff) | |
| download | open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.tar.gz open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.tar.bz2 open-keychain-1b141c61e15526d8a979c917b632bba91b77b859.zip | |
Merge pull request #1610 from open-keychain/facebook
Basic Facebook Support
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java index 869d107ab..df45de11f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java @@ -48,6 +48,9 @@ public class CloudSearch { if (cloudPrefs.searchKeybase) { servers.add(new KeybaseKeyserver(proxy)); } + if (cloudPrefs.searchFacebook) { + servers.add(new FacebookKeyserver(proxy)); + } final ImportKeysList results = new ImportKeysList(servers.size()); ArrayList<Thread> searchThreads = new ArrayList<>(); |