diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-05-28 07:04:01 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-05-28 07:04:01 +0000 |
| commit | eed42b2e34d6ba7e6eda43640eb3bb1555d9e24f (patch) | |
| tree | 768ceeb8a27bf1c850b9ac986506461f8e3c271e /src/org/thialfihar/android/apg/provider/Database.java | |
| parent | b943f706b60538bc343e643879a607b389ebb1ca (diff) | |
| download | open-keychain-eed42b2e34d6ba7e6eda43640eb3bb1555d9e24f.tar.gz open-keychain-eed42b2e34d6ba7e6eda43640eb3bb1555d9e24f.tar.bz2 open-keychain-eed42b2e34d6ba7e6eda43640eb3bb1555d9e24f.zip | |
fully removed old DataProvider for now, manage queries, clean up old database stuff
Diffstat (limited to 'src/org/thialfihar/android/apg/provider/Database.java')
| -rw-r--r-- | src/org/thialfihar/android/apg/provider/Database.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/thialfihar/android/apg/provider/Database.java b/src/org/thialfihar/android/apg/provider/Database.java index 38c346086..505248d14 100644 --- a/src/org/thialfihar/android/apg/provider/Database.java +++ b/src/org/thialfihar/android/apg/provider/Database.java @@ -160,13 +160,13 @@ public class Database extends SQLiteOpenHelper { UserIds.USER_ID + " " + UserIds.USER_ID_type + "," +
UserIds.RANK + " " + UserIds.RANK_type + ");");
- Cursor cursor = db.query(PublicKeys.TABLE_NAME,
+ Cursor cursor = db.query("public_keys",
new String[]{
- PublicKeys.KEY_DATA,
+ "c_key_data",
}, null, null, null, null, null);
if (cursor != null && cursor.moveToFirst()) {
do {
- byte[] data = cursor.getBlob(cursor.getColumnIndex(PublicKeys.KEY_DATA));
+ byte[] data = cursor.getBlob(0);
try {
PGPPublicKeyRing keyRing = new PGPPublicKeyRing(data);
saveKeyRing(keyRing);
@@ -183,13 +183,13 @@ public class Database extends SQLiteOpenHelper { cursor.close();
}
- cursor = db.query(SecretKeys.TABLE_NAME,
+ cursor = db.query("secret_keys",
new String[]{
- SecretKeys.KEY_DATA,
+ "c_key_data",
}, null, null, null, null, null);
if (cursor != null && cursor.moveToFirst()) {
do {
- byte[] data = cursor.getBlob(cursor.getColumnIndex(SecretKeys.KEY_DATA));
+ byte[] data = cursor.getBlob(0);
try {
PGPSecretKeyRing keyRing = new PGPSecretKeyRing(data);
saveKeyRing(keyRing);
|