diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-07-05 13:22:03 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-07-05 13:22:03 +0000 |
| commit | ff2da0c5d152c2c71add1238a7dfc8d4c7d7a90f (patch) | |
| tree | e0ece114826a6e100c7d7baf9f16da961c071787 /src/org/thialfihar/android/apg/PreferencesActivity.java | |
| parent | c1699150a817fcc029589a73a22282df7110202c (diff) | |
| download | open-keychain-ff2da0c5d152c2c71add1238a7dfc8d4c7d7a90f.tar.gz open-keychain-ff2da0c5d152c2c71add1238a7dfc8d4c7d7a90f.tar.bz2 open-keychain-ff2da0c5d152c2c71add1238a7dfc8d4c7d7a90f.zip | |
added some info about the speed of compression algorithms, mostly to warn about BZIP2, also added support for content URIs in file encrypt/decrypt activities
Diffstat (limited to 'src/org/thialfihar/android/apg/PreferencesActivity.java')
| -rw-r--r-- | src/org/thialfihar/android/apg/PreferencesActivity.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/org/thialfihar/android/apg/PreferencesActivity.java b/src/org/thialfihar/android/apg/PreferencesActivity.java index 3f3a709a9..7e89e40a7 100644 --- a/src/org/thialfihar/android/apg/PreferencesActivity.java +++ b/src/org/thialfihar/android/apg/PreferencesActivity.java @@ -18,6 +18,7 @@ package org.thialfihar.android.apg; import org.bouncycastle2.bcpg.HashAlgorithmTags;
import org.bouncycastle2.openpgp.PGPEncryptedData;
+import org.thialfihar.android.apg.utils.Choice;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
@@ -118,12 +119,16 @@ public class PreferencesActivity extends PreferenceActivity { mMessageCompression = (IntegerListPreference) findPreference(Constants.pref.default_message_compression);
valueIds = new int[] {
- Id.choice.compression.none, Id.choice.compression.zip,
- Id.choice.compression.bzip2, Id.choice.compression.zlib,
+ Id.choice.compression.none,
+ Id.choice.compression.zip,
+ Id.choice.compression.zlib,
+ Id.choice.compression.bzip2,
};
entries = new String[] {
- getString(R.string.choice_none), "ZIP",
- "BZIP2", "ZLIB",
+ getString(R.string.choice_none) + " (" + getString(R.string.fast) + ")",
+ "ZIP (" + getString(R.string.fast) + ")",
+ "ZLIB (" + getString(R.string.fast) + ")",
+ "BZIP2 (" + getString(R.string.very_slow) + ")",
};
values = new String[valueIds.length];
for (int i = 0; i < values.length; ++i) {
|