moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

Show main user id instead of key in certify screen

This commit is contained in:
Dominik Schürmann 2015-03-15 16:32:52 +01:00
parent e873bac880
commit 81d6da899f
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
View File

@ -81,16 +81,6 @@ public class MultiUserIdsAdapter extends CursorAdapter {
ArrayList<String> uids = p.createStringArrayList();
p.recycle();
if (isHeader == 1) {
long masterKeyId = cursor.getLong(0);
vHeaderId.setVisibility(View.VISIBLE);
String message = mContext.getString(R.string.section_uids_to_certify) +
KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId);
vHeaderId.setText(message);
} else {
vHeaderId.setVisibility(View.GONE);
}
{ // first one
String userId = uids.get(0);
String[] splitUserId = KeyRing.splitUserId(userId);
@ -99,6 +89,21 @@ public class MultiUserIdsAdapter extends CursorAdapter {
} else {
vName.setText(R.string.user_id_no_name);
}
if (isHeader == 1) {
vHeaderId.setVisibility(View.VISIBLE);
String message;
if (splitUserId[0] != null) {
message = mContext.getString(R.string.section_uids_to_certify) +
splitUserId[0];
} else {
message = mContext.getString(R.string.section_uids_to_certify) +
context.getString(R.string.user_id_no_name);
}
vHeaderId.setText(message);
} else {
vHeaderId.setVisibility(View.GONE);
}
}
StringBuilder lines = new StringBuilder();