aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-24 00:23:40 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-24 00:23:40 +0200
commitbfc3774f020cdd10f8218aa98c18e0a29383f138 (patch)
tree961d70fada71c900026e0b2d2c09d1ec16100954 /OpenKeychain/src/main/java/org
parentefa5a80eb618f401bfe14480400acfc39acd5b7e (diff)
parentd4fb71cb762f1179398acf6fc15eddd0298c0d4a (diff)
downloadopen-keychain-bfc3774f020cdd10f8218aa98c18e0a29383f138.tar.gz
open-keychain-bfc3774f020cdd10f8218aa98c18e0a29383f138.tar.bz2
open-keychain-bfc3774f020cdd10f8218aa98c18e0a29383f138.zip
Merge pull request #973 from timbray/development
Make the Certify screen a little more self-explanatory
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
index 7a4d77145..50cdb0e04 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java
@@ -69,8 +69,7 @@ public class MultiUserIdsAdapter extends CursorAdapter {
@Override
public void bindView(View view, Context context, Cursor cursor) {
- View vHeader = view.findViewById(R.id.user_id_header);
- TextView vHeaderId = (TextView) view.findViewById(R.id.user_id_header_id);
+ TextView vHeaderId = (TextView) view.findViewById(R.id.user_id_header);
TextView vName = (TextView) view.findViewById(R.id.user_id_item_name);
TextView vAddresses = (TextView) view.findViewById(R.id.user_id_item_addresses);
@@ -84,10 +83,12 @@ public class MultiUserIdsAdapter extends CursorAdapter {
if (isHeader == 1) {
long masterKeyId = cursor.getLong(0);
- vHeader.setVisibility(View.VISIBLE);
- vHeaderId.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId));
+ vHeaderId.setVisibility(View.VISIBLE);
+ String message = mContext.getString(R.string.section_uids_to_certify) +
+ KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId);
+ vHeaderId.setText(message);
} else {
- vHeader.setVisibility(View.GONE);
+ vHeaderId.setVisibility(View.GONE);
}
{ // first one