default message/file compression settings added, also a setting for file decryption to change the default when a file requires it

3 files changed, 76 insertions, 4 deletions

diff --git a/res/layout/encrypt.xml b/res/layout/encrypt.xml
index b4b023635..dd51318c2 100644
--- a/res/layout/encrypt.xml
+++ b/res/layout/encrypt.xml
@@ -109,6 +109,29 @@
                     </LinearLayout>
 
                     <LinearLayout
+                         android:layout_width="fill_parent"
+                         android:layout_height="wrap_content"
+                         android:orientation="horizontal">
+
+                         <TextView
+                             android:id="@+id/label_fileCompression"
+                             android:text="@string/label_fileCompression"
+                             android:textAppearance="?android:attr/textAppearanceMedium"
+                             android:layout_height="wrap_content"
+                             android:layout_width="0dip"
+                             android:layout_weight="1"
+                             android:layout_gravity="center_vertical"
+                             android:paddingRight="10dip"/>
+
+                         <Spinner
+                             android:id="@+id/fileCompression"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
diff --git a/res/layout/preferences.xml b/res/layout/preferences.xml
index 81690987a..1ff97a0e4 100644
--- a/res/layout/preferences.xml
+++ b/res/layout/preferences.xml
@@ -46,8 +46,8 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/label_passPhraseCache"
-                android:text="@string/label_passPhraseCache"
+                android:id="@+id/label_passPhraseCacheTtl"
+                android:text="@string/label_passPhraseCacheTtl"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_height="wrap_content"
                 android:layout_width="0dip"
@@ -56,7 +56,7 @@
                 android:paddingRight="10dip"/>
 
             <Spinner
-                android:id="@+id/passPhraseCache"
+                android:id="@+id/passPhraseCacheTtl"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"/>
@@ -129,6 +129,52 @@
             android:orientation="horizontal">
 
             <TextView
+                android:id="@+id/label_messageCompression"
+                android:text="@string/label_messageCompression"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/messageCompression"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/label_fileCompression"
+                android:text="@string/label_fileCompression"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_height="wrap_content"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip"/>
+
+            <Spinner
+                android:id="@+id/fileCompression"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+       </LinearLayout>
+
+       <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
                 android:id="@+id/label_asciiArmour"
                 android:text="@string/label_asciiArmour"
                 android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aaeec61ab..856ed0c4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -93,7 +93,9 @@
     <string name="label_hashAlgorithm">Hash Algorithm</string>
     <string name="label_asymmetric">Public Key</string>
     <string name="label_symmetric">Pass Phrase</string>
-    <string name="label_passPhraseCache">Pass Phrase Cache</string>
+    <string name="label_passPhraseCacheTtl">Pass Phrase Cache</string>
+    <string name="label_messageCompression">Message Compression</string>
+    <string name="label_fileCompression">File Compression</string>
 
     <string name="noKeysSelected">Select</string>
     <string name="oneKeySelected">1 Selected</string>
@@ -110,6 +112,7 @@
     <string name="notValid">not valid</string>
 
     <!-- choice_lowerCase: capitalized firwst word, no punctuation -->
+    <string name="choice_none">None</string>
     <string name="choice_signOnly">Sign only</string>
     <string name="choice_encryptOnly">Encrypt only</string>
     <string name="choice_signAndEncrypt">Sign and Encrypt</string>