diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-05 00:02:48 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-05 00:02:48 +0200 |
commit | 9a737c7318e20a56a7d7a2efd8602fb0bec05101 (patch) | |
tree | 1e5b794d551f7382e2a31520f0505a954101b73a /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider | |
parent | fcec7e830c11fa0bda903ea9913fa2e41fa4d2e2 (diff) | |
download | open-keychain-9a737c7318e20a56a7d7a2efd8602fb0bec05101.tar.gz open-keychain-9a737c7318e20a56a7d7a2efd8602fb0bec05101.tar.bz2 open-keychain-9a737c7318e20a56a7d7a2efd8602fb0bec05101.zip |
rename crypto consumers to api apps
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider')
4 files changed, 37 insertions, 37 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java index 985498e3a..e9637c35d 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java @@ -53,7 +53,7 @@ public class KeychainContract { String RANK = "rank"; } - interface CryptoConsumersColumns { + interface ApiAppsColumns { String PACKAGE_NAME = "package_name"; String PRIVATE_KEY_ID = "private_key_id"; // not a database id String ASCII_ARMOR = "ascii_armor"; @@ -87,7 +87,7 @@ public class KeychainContract { public static final String PATH_USER_IDS = "user_ids"; public static final String PATH_KEYS = "keys"; - public static final String BASE_CRYPTO_CONSUMERS = "crypto_consumers"; + public static final String BASE_API_APPS = "api_apps"; public static final String PATH_BY_PACKAGE_NAME = "package_name"; public static class KeyRings implements KeyRingsColumns, BaseColumns { @@ -219,15 +219,15 @@ public class KeychainContract { } } - public static class CryptoConsumers implements CryptoConsumersColumns, BaseColumns { + public static class ApiApps implements ApiAppsColumns, BaseColumns { public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon() - .appendPath(BASE_CRYPTO_CONSUMERS).build(); + .appendPath(BASE_API_APPS).build(); /** Use if multiple items get returned */ - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.crypto_consumers"; + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.api_apps"; /** Use if a single item is returned */ - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.crypto_consumers"; + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.api_apps"; public static Uri buildIdUri(String rowId) { return CONTENT_URI.buildUpon().appendPath(rowId).build(); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java index 6f31f4945..283ab73e3 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java @@ -18,7 +18,7 @@ package org.sufficientlysecure.keychain.provider; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumersColumns; +import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAppsColumns; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns; import org.sufficientlysecure.keychain.provider.KeychainContract.KeysColumns; import org.sufficientlysecure.keychain.provider.KeychainContract.UserIdsColumns; @@ -37,7 +37,7 @@ public class KeychainDatabase extends SQLiteOpenHelper { String KEY_RINGS = "key_rings"; String KEYS = "keys"; String USER_IDS = "user_ids"; - String CRYPTO_CONSUMERS = "crypto_consumers"; + String API_APPS = "api_apps"; } private static final String CREATE_KEY_RINGS = "CREATE TABLE IF NOT EXISTS " + Tables.KEY_RINGS @@ -64,14 +64,14 @@ public class KeychainDatabase extends SQLiteOpenHelper { + UserIdsColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "(" + BaseColumns._ID + ") ON DELETE CASCADE)"; - private static final String CREATE_CRYPTO_CONSUMERS = "CREATE TABLE IF NOT EXISTS " - + Tables.CRYPTO_CONSUMERS + " (" + BaseColumns._ID - + " INTEGER PRIMARY KEY AUTOINCREMENT, " + CryptoConsumersColumns.PACKAGE_NAME - + " TEXT UNIQUE, " + CryptoConsumersColumns.PRIVATE_KEY_ID + " INT64, " - + CryptoConsumersColumns.ASCII_ARMOR + " INTEGER, " - + CryptoConsumersColumns.ENCRYPTION_ALGORITHM + " INTEGER, " - + CryptoConsumersColumns.HASH_ALORITHM + " INTEGER, " - + CryptoConsumersColumns.COMPRESSION + " INTEGER)"; + private static final String CREATE_API_APPS = "CREATE TABLE IF NOT EXISTS " + + Tables.API_APPS + " (" + BaseColumns._ID + + " INTEGER PRIMARY KEY AUTOINCREMENT, " + ApiAppsColumns.PACKAGE_NAME + + " TEXT UNIQUE, " + ApiAppsColumns.PRIVATE_KEY_ID + " INT64, " + + ApiAppsColumns.ASCII_ARMOR + " INTEGER, " + + ApiAppsColumns.ENCRYPTION_ALGORITHM + " INTEGER, " + + ApiAppsColumns.HASH_ALORITHM + " INTEGER, " + + ApiAppsColumns.COMPRESSION + " INTEGER)"; KeychainDatabase(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); @@ -84,7 +84,7 @@ public class KeychainDatabase extends SQLiteOpenHelper { db.execSQL(CREATE_KEY_RINGS); db.execSQL(CREATE_KEYS); db.execSQL(CREATE_USER_IDS); - db.execSQL(CREATE_CRYPTO_CONSUMERS); + db.execSQL(CREATE_API_APPS); } @Override @@ -112,7 +112,7 @@ public class KeychainDatabase extends SQLiteOpenHelper { + " = 1 WHERE " + KeysColumns.IS_MASTER_KEY + "= 1;"); break; case 4: - db.execSQL(CREATE_CRYPTO_CONSUMERS); + db.execSQL(CREATE_API_APPS); default: break; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java index c875b7a70..6275b3b5c 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.HashMap; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers; +import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyTypes; @@ -228,10 +228,10 @@ public class KeychainProvider extends ContentProvider { /** * Crypto Consumers */ - matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS, CRYPTO_CONSUMERS); - matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/#", + matcher.addURI(authority, KeychainContract.BASE_API_APPS, CRYPTO_CONSUMERS); + matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/#", CRYPTO_CONSUMERS_BY_ROW_ID); - matcher.addURI(authority, KeychainContract.BASE_CRYPTO_CONSUMERS + "/" + matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/" + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", CRYPTO_CONSUMERS_BY_PACKAGE_NAME); /** @@ -294,11 +294,11 @@ public class KeychainProvider extends ContentProvider { return UserIds.CONTENT_ITEM_TYPE; case CRYPTO_CONSUMERS: - return CryptoConsumers.CONTENT_TYPE; + return ApiApps.CONTENT_TYPE; case CRYPTO_CONSUMERS_BY_ROW_ID: case CRYPTO_CONSUMERS_BY_PACKAGE_NAME: - return CryptoConsumers.CONTENT_ITEM_TYPE; + return ApiApps.CONTENT_ITEM_TYPE; default: throw new UnsupportedOperationException("Unknown uri: " + uri); @@ -609,19 +609,19 @@ public class KeychainProvider extends ContentProvider { break; case CRYPTO_CONSUMERS: - qb.setTables(Tables.CRYPTO_CONSUMERS); + qb.setTables(Tables.API_APPS); break; case CRYPTO_CONSUMERS_BY_ROW_ID: - qb.setTables(Tables.CRYPTO_CONSUMERS); + qb.setTables(Tables.API_APPS); qb.appendWhere(BaseColumns._ID + " = "); qb.appendWhereEscapeString(uri.getLastPathSegment()); break; case CRYPTO_CONSUMERS_BY_PACKAGE_NAME: - qb.setTables(Tables.CRYPTO_CONSUMERS); - qb.appendWhere(CryptoConsumers.PACKAGE_NAME + " = "); + qb.setTables(Tables.API_APPS); + qb.appendWhere(ApiApps.PACKAGE_NAME + " = "); qb.appendWhereEscapeString(uri.getPathSegments().get(2)); break; @@ -712,8 +712,8 @@ public class KeychainProvider extends ContentProvider { break; case CRYPTO_CONSUMERS: - rowId = db.insertOrThrow(Tables.CRYPTO_CONSUMERS, null, values); - rowUri = CryptoConsumers.buildIdUri(Long.toString(rowId)); + rowId = db.insertOrThrow(Tables.API_APPS, null, values); + rowUri = ApiApps.buildIdUri(Long.toString(rowId)); break; default: @@ -773,7 +773,7 @@ public class KeychainProvider extends ContentProvider { break; case CRYPTO_CONSUMERS_BY_ROW_ID: case CRYPTO_CONSUMERS_BY_PACKAGE_NAME: - count = db.delete(Tables.CRYPTO_CONSUMERS, + count = db.delete(Tables.API_APPS, buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs); break; default: @@ -838,7 +838,7 @@ public class KeychainProvider extends ContentProvider { break; case CRYPTO_CONSUMERS_BY_ROW_ID: case CRYPTO_CONSUMERS_BY_PACKAGE_NAME: - count = db.update(Tables.CRYPTO_CONSUMERS, values, + count = db.update(Tables.API_APPS, values, buildDefaultCryptoConsumersSelection(uri, selection), selectionArgs); break; default: diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 57d3b54d6..c8f9baeff 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -31,7 +31,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.helper.PgpConversionHelper; import org.sufficientlysecure.keychain.helper.PgpHelper; import org.sufficientlysecure.keychain.helper.PgpMain; -import org.sufficientlysecure.keychain.provider.KeychainContract.CryptoConsumers; +import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainContract.Keys; import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds; @@ -719,12 +719,12 @@ public class ProviderHelper { } public static ArrayList<String> getCryptoConsumers(Context context) { - Cursor cursor = context.getContentResolver().query(CryptoConsumers.CONTENT_URI, null, null, + Cursor cursor = context.getContentResolver().query(ApiApps.CONTENT_URI, null, null, null, null); ArrayList<String> packageNames = new ArrayList<String>(); if (cursor != null) { - int packageNameCol = cursor.getColumnIndex(CryptoConsumers.PACKAGE_NAME); + int packageNameCol = cursor.getColumnIndex(ApiApps.PACKAGE_NAME); if (cursor.moveToFirst()) { do { packageNames.add(cursor.getString(packageNameCol)); @@ -741,7 +741,7 @@ public class ProviderHelper { public static void addCryptoConsumer(Context context, String packageName) { ContentValues values = new ContentValues(); - values.put(CryptoConsumers.PACKAGE_NAME, packageName); - context.getContentResolver().insert(CryptoConsumers.CONTENT_URI, values); + values.put(ApiApps.PACKAGE_NAME, packageName); + context.getContentResolver().insert(ApiApps.CONTENT_URI, values); } } |