aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-03-06 21:59:56 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-03-06 21:59:56 +0100
commit3d944483d3a255f6dd707cf72eeb772789ec9ecd (patch)
treee1e37dcdf4eea2828fb7f8a11944c20776ed32cf /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
parent9edd4bee700d7710fc477d8608c7c36af8ec8da0 (diff)
parent8e29b82d6daa689f07a8318bf194c8fb17133c95 (diff)
downloadopen-keychain-3d944483d3a255f6dd707cf72eeb772789ec9ecd.tar.gz
open-keychain-3d944483d3a255f6dd707cf72eeb772789ec9ecd.tar.bz2
open-keychain-3d944483d3a255f6dd707cf72eeb772789ec9ecd.zip
Merge pull request #344 from ankushb92/ankush2
#338
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index cf507826e..313655766 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -748,7 +748,7 @@ public class KeychainIntentService extends IntentService implements ProgressDial
*/
// need to have access to the bufferedInput, so we can reuse it for the possible
// PGPObject chunks after the first one, e.g. files with several consecutive ASCII
- // armour blocks
+ // armor blocks
BufferedInputStream bufferedInput = new BufferedInputStream(new ByteArrayInputStream(downloadedKey));
try {