Use default compression in OpenPgpService

This commit is contained in:
Dominik Schürmann
2015-08-02 20:38:30 +02:00
parent dba145f5df
commit 7c40d89eea

View File

@@ -33,7 +33,6 @@ import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpMetadata;
import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.OpenPgpSignatureResult;
import org.openintents.openpgp.util.OpenPgpApi; import org.openintents.openpgp.util.OpenPgpApi;
import org.spongycastle.bcpg.CompressionAlgorithmTags;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEntryParcel; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEntryParcel;
@@ -360,9 +359,9 @@ public class OpenPgpService extends RemoteService {
boolean enableCompression = data.getBooleanExtra(OpenPgpApi.EXTRA_ENABLE_COMPRESSION, true); boolean enableCompression = data.getBooleanExtra(OpenPgpApi.EXTRA_ENABLE_COMPRESSION, true);
int compressionId; int compressionId;
if (enableCompression) { if (enableCompression) {
compressionId = CompressionAlgorithmTags.ZLIB; compressionId = PgpConstants.OpenKeychainCompressionAlgorithmTags.USE_DEFAULT;
} else { } else {
compressionId = CompressionAlgorithmTags.UNCOMPRESSED; compressionId = PgpConstants.OpenKeychainCompressionAlgorithmTags.UNCOMPRESSED;
} }
// first try to get key ids from non-ambiguous key id extra // first try to get key ids from non-ambiguous key id extra