diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-05-29 10:24:00 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-05-29 10:24:00 +0200 |
| commit | be490307f97b5e73bad5c4882afab6dff1f10b48 (patch) | |
| tree | 75cafcdc9ecbb874cf701abd01bd83ac513fbe61 /OpenKeychain/src/main/java | |
| parent | 8e5767f967646412a03563c966c3bb5b7c26e0fa (diff) | |
| download | open-keychain-be490307f97b5e73bad5c4882afab6dff1f10b48.tar.gz open-keychain-be490307f97b5e73bad5c4882afab6dff1f10b48.tar.bz2 open-keychain-be490307f97b5e73bad5c4882afab6dff1f10b48.zip | |
Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 6f38418ff..b6ee234f4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -796,10 +796,11 @@ public class KeychainIntentService extends IntentService ArrayList<ImportKeysListEntry> entries = data.getParcelableArrayList(DOWNLOAD_KEY_LIST); String keyServer = data.getString(DOWNLOAD_KEY_SERVER); - // this downloads the keys and places them into the ImportKeysListEntry entries - HkpKeyserver server = new HkpKeyserver(keyServer); - for (ImportKeysListEntry entry : entries) { + + // this downloads the keys and places them into the ImportKeysListEntry entries + HkpKeyserver server = new HkpKeyserver(entry.getOrigin() != null ? entry.getOrigin() : keyServer); + // if available use complete fingerprint for get request byte[] downloadedKeyBytes; if (entry.getFingerprintHex() != null) { |