From f7eae9c7e290de4214a628a74885af27af944934 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Wed, 19 May 2010 14:38:06 +0000
Subject: [PATCH] actually use the compression settings ;), and give them
 better default values

---
 src/org/thialfihar/android/apg/Apg.java          | 2 +-
 src/org/thialfihar/android/apg/BaseActivity.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index e290a501e..e6e7bafce 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -1329,7 +1329,7 @@ public class Apg {
         if (compression == Id.choice.compression.none) {
             bcpgOut = new BCPGOutputStream(encryptOut);
         } else {
-            compressGen = new PGPCompressedDataGenerator(CompressionAlgorithmTags.ZLIB);
+            compressGen = new PGPCompressedDataGenerator(compression);
             bcpgOut = new BCPGOutputStream(compressGen.open(encryptOut));
         }
         if (signatureKeyId != 0) {
diff --git a/src/org/thialfihar/android/apg/BaseActivity.java b/src/org/thialfihar/android/apg/BaseActivity.java
index 64705ba1f..4ff5f6f17 100644
--- a/src/org/thialfihar/android/apg/BaseActivity.java
+++ b/src/org/thialfihar/android/apg/BaseActivity.java
@@ -417,7 +417,7 @@ public class BaseActivity extends Activity
 
     public int getDefaultMessageCompression() {
         return mPreferences.getInt(Constants.pref.default_message_compression,
-                                   CompressionAlgorithmTags.ZLIB);
+                                   Id.choice.compression.zlib);
     }
 
     public void setDefaultMessageCompression(int value) {
@@ -428,7 +428,7 @@ public class BaseActivity extends Activity
 
     public int getDefaultFileCompression() {
         return mPreferences.getInt(Constants.pref.default_file_compression,
-                                   CompressionAlgorithmTags.ZLIB);
+                                   Id.choice.compression.none);
     }
 
     public void setDefaultFileCompression(int value) {