aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-30 13:52:56 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-30 13:52:56 +0200
commitef209450c67f6d47756ffd900fcb8ab4083482f4 (patch)
treef7b4e1914058a75884e68cf34e640954e50dc97d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
parent99fe806ea35a037dcd352db86d46eb501a850f47 (diff)
downloadopen-keychain-ef209450c67f6d47756ffd900fcb8ab4083482f4.tar.gz
open-keychain-ef209450c67f6d47756ffd900fcb8ab4083482f4.tar.bz2
open-keychain-ef209450c67f6d47756ffd900fcb8ab4083482f4.zip
some decrypt/verify bug fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index bef0519a3..0d2d3256d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -528,6 +528,7 @@ public class OpenPgpService extends RemoteService {
PgpDecryptVerify op = new PgpDecryptVerify(this, mProviderHelper, null);
long inputLength = inputStream.available();
+ InputData inputData = new InputData(inputStream, inputLength);
// allow only private keys associated with accounts of this app
// no support for symmetric encryption
@@ -537,7 +538,7 @@ public class OpenPgpService extends RemoteService {
.setDecryptMetadataOnly(decryptMetadataOnly)
.setDetachedSignature(detachedSignature);
- DecryptVerifyResult pgpResult = op.execute(input, cryptoInput, inputStream, outputStream);
+ DecryptVerifyResult pgpResult = op.execute(input, cryptoInput, inputData, outputStream);
if (pgpResult.isPending()) {
// prepare and return PendingIntent to be executed by client