aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorDurgesh <007durgesh219@gmail.com>2016-03-06 18:38:45 +0530
committerDurgesh <007durgesh219@gmail.com>2016-03-06 18:39:30 +0530
commit8b8b91e24722f254ad84916d3e1b6c6210906924 (patch)
treead969d626b0915595187fa113e268311f965362c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parent201c38ec02b37b9b389085e412d8ea01764b6276 (diff)
downloadopen-keychain-8b8b91e24722f254ad84916d3e1b6c6210906924.tar.gz
open-keychain-8b8b91e24722f254ad84916d3e1b6c6210906924.tar.bz2
open-keychain-8b8b91e24722f254ad84916d3e1b6c6210906924.zip
Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752
Signed-off-by: Durgesh <007durgesh219@gmail.com>
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
index 009876045..328daa7ff 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
@@ -470,7 +470,13 @@ public class PgpSignEncryptOperation extends BaseOperation {
InputStream in = new BufferedInputStream(inputData.getInputStream());
if (enableCompression) {
- compressGen = new PGPCompressedDataGenerator(input.getCompressionAlgorithm());
+ // Use preferred compression algo
+ int algo = input.getCompressionAlgorithm();
+ if (algo == PgpSecurityConstants.OpenKeychainCompressionAlgorithmTags.USE_DEFAULT) {
+ algo = PgpSecurityConstants.DEFAULT_COMPRESSION_ALGORITHM;
+ }
+
+ compressGen = new PGPCompressedDataGenerator(algo);
bcpgOut = new BCPGOutputStream(compressGen.open(out));
} else {
bcpgOut = new BCPGOutputStream(out);