diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-11 00:14:38 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-11 00:14:38 +0100 |
| commit | 3b38ffe55eef7a3a9a0cd4367c7f7ee42e4305b8 (patch) | |
| tree | fc3c4279cddc9a5e2491885fde3669f61ba417da /OpenPGP-Keychain/src | |
| parent | 7a8db90425dc32ab8f31eb609bfe73999e6dec3e (diff) | |
| download | open-keychain-3b38ffe55eef7a3a9a0cd4367c7f7ee42e4305b8.tar.gz open-keychain-3b38ffe55eef7a3a9a0cd4367c7f7ee42e4305b8.tar.bz2 open-keychain-3b38ffe55eef7a3a9a0cd4367c7f7ee42e4305b8.zip | |
experimental cert display
Diffstat (limited to 'OpenPGP-Keychain/src')
2 files changed, 8 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java index c7403b0a0..6a87beb31 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java @@ -39,6 +39,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.provider.KeychainContract; +import org.sufficientlysecure.keychain.provider.KeychainDatabase; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.ui.adapter.ViewKeyKeysAdapter; import org.sufficientlysecure.keychain.ui.adapter.ViewKeyUserIdsAdapter; @@ -173,10 +174,10 @@ public class ViewKeyMainFragment extends Fragment implements static final int KEYRING_INDEX_MASTER_KEY_ID = 1; static final int KEYRING_INDEX_USER_ID = 2; - static final String[] USER_IDS_PROJECTION = new String[]{KeychainContract.UserIds._ID, KeychainContract.UserIds.USER_ID, - KeychainContract.UserIds.RANK,}; + static final String[] USER_IDS_PROJECTION = new String[]{ KeychainContract.UserIds._ID, KeychainContract.UserIds.USER_ID, + KeychainContract.UserIds.RANK, "verified" }; // not the main user id - static final String USER_IDS_SELECTION = KeychainContract.UserIds.RANK + " > 0 "; + static final String USER_IDS_SELECTION = KeychainDatabase.Tables.USER_IDS + "." + KeychainContract.UserIds.RANK + " > 0 "; static final String USER_IDS_SORT_ORDER = KeychainContract.UserIds.USER_ID + " COLLATE LOCALIZED ASC"; static final String[] KEYS_PROJECTION = new String[]{KeychainContract.Keys._ID, KeychainContract.Keys.KEY_ID, diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java index cf8699417..5a991ce11 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java @@ -32,6 +32,7 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter { private LayoutInflater mInflater; private int mIndexUserId; + private int mVerifiedId; public ViewKeyUserIdsAdapter(Context context, Cursor c, int flags) { super(context, c, flags); @@ -57,15 +58,17 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter { private void initIndex(Cursor cursor) { if (cursor != null) { mIndexUserId = cursor.getColumnIndexOrThrow(UserIds.USER_ID); + mVerifiedId = cursor.getColumnIndexOrThrow("verified"); } } @Override public void bindView(View view, Context context, Cursor cursor) { String userIdStr = cursor.getString(mIndexUserId); + int verified = cursor.getInt(mVerifiedId); TextView userId = (TextView) view.findViewById(R.id.userId); - userId.setText(userIdStr); + userId.setText(userIdStr + (verified > 0 ? " (ok)" : "(nope)")); } @Override |