From 6952e630c413314da1cbc0d335825c7613e4ae93 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 12 Aug 2014 11:36:47 +0200 Subject: show user name as well in confernce details if real name was shown --- src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index b037b8bc..c33277f9 100644 --- a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -233,7 +233,6 @@ public class ConferenceDetailsActivity extends XmppActivity { .findViewById(R.id.contact_display_name); TextView key = (TextView) view.findViewById(R.id.key); TextView role = (TextView) view.findViewById(R.id.contact_jid); - role.setText(getReadableRole(user.getRole())); if (user.getPgpKeyId() != 0) { key.setVisibility(View.VISIBLE); key.setOnClickListener(new OnClickListener() { @@ -251,15 +250,18 @@ public class ConferenceDetailsActivity extends XmppActivity { if (contact.showInRoster()) { bm = contact.getImage(48, this); name.setText(contact.getDisplayName()); + role.setText(user.getName() + " \u2022 " + getReadableRole(user.getRole())); } else { bm = UIHelper.getContactPicture(user.getName(), 48, this, false); name.setText(user.getName()); + role.setText(getReadableRole(user.getRole())); } } else { bm = UIHelper .getContactPicture(user.getName(), 48, this, false); name.setText(user.getName()); + role.setText(getReadableRole(user.getRole())); } ImageView iv = (ImageView) view.findViewById(R.id.contact_photo); iv.setImageBitmap(bm); -- cgit v1.2.3