diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-14 13:48:20 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-14 13:48:20 +0200 |
commit | b04e6816f44c29fdbd0d37a8be70d9e15a24b0f4 (patch) | |
tree | 6f8b638f4fb851fc5284115ef234c16e1714ad72 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | |
parent | 59220fbe04fcf61daacdeb9e75d00f9fb17fba16 (diff) | |
download | open-keychain-b04e6816f44c29fdbd0d37a8be70d9e15a24b0f4.tar.gz open-keychain-b04e6816f44c29fdbd0d37a8be70d9e15a24b0f4.tar.bz2 open-keychain-b04e6816f44c29fdbd0d37a8be70d9e15a24b0f4.zip |
Removing remaining uses of Id, closing one of the oldest bugs #9
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java index c8c99c054..a67da8268 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java @@ -31,7 +31,6 @@ import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.openpgp.PGPEncryptedData; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.Id; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.Preferences; import org.sufficientlysecure.keychain.ui.widget.IntegerListPreference; @@ -89,8 +88,12 @@ public class PreferencesActivity extends PreferenceActivity { initializeEncryptionAlgorithm( (IntegerListPreference) findPreference(Constants.Pref.DEFAULT_ENCRYPTION_ALGORITHM)); - int[] valueIds = new int[]{Id.choice.compression.none, Id.choice.compression.zip, - Id.choice.compression.zlib, Id.choice.compression.bzip2,}; + int[] valueIds = new int[]{ + Constants.choice.compression.none, + Constants.choice.compression.zip, + Constants.choice.compression.zlib, + Constants.choice.compression.bzip2, + }; String[] entries = new String[]{ getString(R.string.choice_none) + " (" + getString(R.string.compression_fast) + ")", "ZIP (" + getString(R.string.compression_fast) + ")", @@ -226,13 +229,20 @@ public class PreferencesActivity extends PreferenceActivity { initializeEncryptionAlgorithm( (IntegerListPreference) findPreference(Constants.Pref.DEFAULT_ENCRYPTION_ALGORITHM)); - int[] valueIds = new int[]{Id.choice.compression.none, Id.choice.compression.zip, - Id.choice.compression.zlib, Id.choice.compression.bzip2,}; + int[] valueIds = new int[]{ + Constants.choice.compression.none, + Constants.choice.compression.zip, + Constants.choice.compression.zlib, + Constants.choice.compression.bzip2, + }; + String[] entries = new String[]{ getString(R.string.choice_none) + " (" + getString(R.string.compression_fast) + ")", "ZIP (" + getString(R.string.compression_fast) + ")", "ZLIB (" + getString(R.string.compression_fast) + ")", - "BZIP2 (" + getString(R.string.compression_very_slow) + ")",}; + "BZIP2 (" + getString(R.string.compression_very_slow) + ")", + }; + String[] values = new String[valueIds.length]; for (int i = 0; i < values.length; ++i) { values[i] = "" + valueIds[i]; |