diff options
| author | Dominik <dominik@dominikschuermann.de> | 2012-03-09 10:51:38 +0100 |
|---|---|---|
| committer | Dominik <dominik@dominikschuermann.de> | 2012-03-09 10:51:38 +0100 |
| commit | a942c4a507a0df871c43d69076689ad1dd659e10 (patch) | |
| tree | a78a06e665b5ecb415c635fc9d776f7a882a8d14 /src/org/thialfihar/android/apg/provider/Database.java | |
| parent | 3ec27e07aead6f548d62bde55220d20337f1c570 (diff) | |
| parent | ad1657465778c05cef7a7ba9d25f97943cf68144 (diff) | |
| download | open-keychain-a942c4a507a0df871c43d69076689ad1dd659e10.tar.gz open-keychain-a942c4a507a0df871c43d69076689ad1dd659e10.tar.bz2 open-keychain-a942c4a507a0df871c43d69076689ad1dd659e10.zip | |
merged apg_service from googlecode
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; |