moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-06 17:25:05 -05:00
Code Issues Releases Wiki Activity

join cert info into query routines

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-03-11 00:14:04 +01:00
parent ba7613dc34
commit 7a8db90425
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
View File

@ -485,6 +485,8 @@ public class KeychainProvider extends ContentProvider {
SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
SQLiteDatabase db = mApgDatabase.getReadableDatabase(); SQLiteDatabase db = mApgDatabase.getReadableDatabase();
String groupBy = null;
int match = mUriMatcher.match(uri); int match = mUriMatcher.match(uri);
// screw that switch // screw that switch
@ -677,8 +679,25 @@ public class KeychainProvider extends ContentProvider {
case PUBLIC_KEY_RING_USER_ID: case PUBLIC_KEY_RING_USER_ID:
case SECRET_KEY_RING_USER_ID: case SECRET_KEY_RING_USER_ID:
qb.setTables(Tables.USER_IDS); qb.setTables(Tables.USER_IDS
qb.appendWhere(UserIdsColumns.KEY_RING_ROW_ID + " = "); + " LEFT JOIN " + Tables.CERTS
+ " ON ("
+ Tables.USER_IDS + "." + UserIds.KEY_RING_ROW_ID + " = "
+ Tables.CERTS + "." + Certs.KEY_RING_ROW_ID
+ " AND " + Tables.USER_IDS + "." + UserIds.RANK + " = "
+ Tables.CERTS + "." + Certs.RANK
+ ")");
groupBy = Tables.USER_IDS + "." + UserIds.RANK;
HashMap<String, String> pmap = new HashMap<String, String>();
pmap.put(UserIds._ID, Tables.USER_IDS + "." + UserIds._ID);
pmap.put(UserIds.USER_ID, Tables.USER_IDS + "." + UserIds.USER_ID);
pmap.put(UserIds.RANK, Tables.USER_IDS + "." + UserIds.RANK);
pmap.put("verified", "COUNT(" + Tables.CERTS + "." + Certs._ID + ") AS verified");
qb.setProjectionMap(pmap);
qb.appendWhere(Tables.USER_IDS + "." + UserIdsColumns.KEY_RING_ROW_ID + " = ");
qb.appendWhereEscapeString(uri.getPathSegments().get(2)); qb.appendWhereEscapeString(uri.getPathSegments().get(2));
break; break;
@ -725,7 +744,7 @@ public class KeychainProvider extends ContentProvider {
orderBy = sortOrder; orderBy = sortOrder;
} }
Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy); Cursor c = qb.query(db, projection, selection, selectionArgs, groupBy, null, orderBy);
// Tell the cursor what uri to watch, so it knows when its source data changes // Tell the cursor what uri to watch, so it knows when its source data changes
c.setNotificationUri(getContext().getContentResolver(), uri); c.setNotificationUri(getContext().getContentResolver(), uri);