diff options
author | Markus Doits <markus.doits@googlemail.com> | 2011-11-03 22:15:31 +0100 |
---|---|---|
committer | Markus Doits <markus.doits@googlemail.com> | 2011-11-03 22:15:31 +0100 |
commit | 8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b (patch) | |
tree | b73be883a93dfd381686c4dbb03e77d8f2ebf2f3 /src/org/thialfihar/android/apg/PreferencesActivity.java | |
parent | e6c86a88922cfc6570d2c96067155c958aa02ee2 (diff) | |
download | open-keychain-8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b.tar.gz open-keychain-8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b.tar.bz2 open-keychain-8d9b0e1db83f9effa9cb240ad46f1ae2f85df98b.zip |
Switch to spongycastle
https://github.com/rtyley/spongycastle
It replaces bouncycastle2. Looks like a cleaner and better integration. A
precompiled .jar ist in the "lib/"-dir.
Diffstat (limited to 'src/org/thialfihar/android/apg/PreferencesActivity.java')
-rw-r--r-- | src/org/thialfihar/android/apg/PreferencesActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/thialfihar/android/apg/PreferencesActivity.java b/src/org/thialfihar/android/apg/PreferencesActivity.java index 0d0d76318..49ea1a983 100644 --- a/src/org/thialfihar/android/apg/PreferencesActivity.java +++ b/src/org/thialfihar/android/apg/PreferencesActivity.java @@ -16,12 +16,8 @@ package org.thialfihar.android.apg; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Vector; - -import org.bouncycastle2.bcpg.HashAlgorithmTags; -import org.bouncycastle2.openpgp.PGPEncryptedData; +import org.spongycastle.bcpg.HashAlgorithmTags; +import org.spongycastle.openpgp.PGPEncryptedData; import org.thialfihar.android.apg.ui.widget.IntegerListPreference; import android.content.Intent; @@ -32,6 +28,10 @@ import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Vector; + public class PreferencesActivity extends PreferenceActivity { private ListPreference mLanguage = null; private IntegerListPreference mPassPhraseCacheTtl = null; |