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/provider/Database.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/provider/Database.java')
| -rw-r--r-- | src/org/thialfihar/android/apg/provider/Database.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/org/thialfihar/android/apg/provider/Database.java b/src/org/thialfihar/android/apg/provider/Database.java index 05beb980d..92d8ae9fb 100644 --- a/src/org/thialfihar/android/apg/provider/Database.java +++ b/src/org/thialfihar/android/apg/provider/Database.java @@ -1,15 +1,10 @@ package org.thialfihar.android.apg.provider; -import java.io.IOException; -import java.util.Date; -import java.util.HashMap; -import java.util.Vector; - -import org.bouncycastle2.openpgp.PGPException; -import org.bouncycastle2.openpgp.PGPPublicKey; -import org.bouncycastle2.openpgp.PGPPublicKeyRing; -import org.bouncycastle2.openpgp.PGPSecretKey; -import org.bouncycastle2.openpgp.PGPSecretKeyRing; +import org.spongycastle.openpgp.PGPException; +import org.spongycastle.openpgp.PGPPublicKey; +import org.spongycastle.openpgp.PGPPublicKeyRing; +import org.spongycastle.openpgp.PGPSecretKey; +import org.spongycastle.openpgp.PGPSecretKeyRing; import org.thialfihar.android.apg.Apg; import org.thialfihar.android.apg.Id; import org.thialfihar.android.apg.utils.IterableIterator; @@ -21,6 +16,11 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; +import java.io.IOException; +import java.util.Date; +import java.util.HashMap; +import java.util.Vector; + public class Database extends SQLiteOpenHelper { public static class GeneralException extends Exception { static final long serialVersionUID = 0xf812773343L; |