diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-10 06:17:31 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-13 23:34:06 +0530 |
| commit | b61a7d55351eca32833662f623c2e42559c587f7 (patch) | |
| tree | e944bf04de8edf88e601540cc0eedbb665dd61e1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter | |
| parent | 2827b1af16de432b253db163cf2a9954bbb3924b (diff) | |
| download | open-keychain-b61a7d55351eca32833662f623c2e42559c587f7.tar.gz open-keychain-b61a7d55351eca32833662f623c2e42559c587f7.tar.bz2 open-keychain-b61a7d55351eca32833662f623c2e42559c587f7.zip | |
added licenses, cleaned up code, fixed warnings
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java index 4b779e75c..e77c92923 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java @@ -49,12 +49,13 @@ public class ImportKeysListCloudLoader private AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> mEntryListWrapper; /** - * Pass a parcelableProxy to specify an explicit proxy, otherwise will fetch from preferences + * Searches a keyserver as specified in cloudPrefs, using an explicit proxy if passed * - * @param context - * @param serverQuery - * @param cloudPrefs - * @param parcelableProxy + * @param serverQuery string to search on servers for. If is a fingerprint, + * will enforce fingerprint check + * @param cloudPrefs contains keyserver to search on, whether to search on the keyserver, + * and whether to search keybase.io + * @param parcelableProxy explicit proxy to use. If null, will retrieve from preferences */ public ImportKeysListCloudLoader(Context context, String serverQuery, Preferences.CloudSearchPrefs cloudPrefs, @Nullable ParcelableProxy parcelableProxy) { |