diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 23:09:25 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 23:09:25 +0200 |
| commit | ce4bfdf94555a90b47818546a8e51ffd35db8ec5 (patch) | |
| tree | 202a65ba4ad813f0ed337f2ef8783b90da3942bf /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |
| parent | 9c9fc5330a402fb873708b998dac5f1ebf54b71c (diff) | |
| parent | 37caddca7021039f9828d1c08164499748fb5ca5 (diff) | |
| download | open-keychain-ce4bfdf94555a90b47818546a8e51ffd35db8ec5.tar.gz open-keychain-ce4bfdf94555a90b47818546a8e51ffd35db8ec5.tar.bz2 open-keychain-ce4bfdf94555a90b47818546a8e51ffd35db8ec5.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 5 |
1 files changed, 3 insertions, 2 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 4330a1c01..ad2932f92 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -587,8 +587,9 @@ public class KeychainIntentService extends IntentService CanonicalizedPublicKeyRing keyring = providerHelper.getCanonicalizedPublicKeyRing(dataUri); PgpImportExport pgpImportExport = new PgpImportExport(this, null); - boolean uploaded = pgpImportExport.uploadKeyRingToServer(server, keyring); - if (!uploaded) { + try { + pgpImportExport.uploadKeyRingToServer(server, keyring); + } catch (Keyserver.AddKeyException e) { throw new PgpGeneralException("Unable to export key to selected server"); } |