sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

show user name as well in confernce details if real name was shown

This commit is contained in:
iNPUTmice 2014-08-12 11:36:47 +02:00
parent 5ed9c2a805
commit 6952e630c4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -233,7 +233,6 @@ public class ConferenceDetailsActivity extends XmppActivity {
.findViewById(R.id.contact_display_name); .findViewById(R.id.contact_display_name);
TextView key = (TextView) view.findViewById(R.id.key); TextView key = (TextView) view.findViewById(R.id.key);
TextView role = (TextView) view.findViewById(R.id.contact_jid); TextView role = (TextView) view.findViewById(R.id.contact_jid);
role.setText(getReadableRole(user.getRole()));
if (user.getPgpKeyId() != 0) { if (user.getPgpKeyId() != 0) {
key.setVisibility(View.VISIBLE); key.setVisibility(View.VISIBLE);
key.setOnClickListener(new OnClickListener() { key.setOnClickListener(new OnClickListener() {
@ -251,15 +250,18 @@ public class ConferenceDetailsActivity extends XmppActivity {
if (contact.showInRoster()) { if (contact.showInRoster()) {
bm = contact.getImage(48, this); bm = contact.getImage(48, this);
name.setText(contact.getDisplayName()); name.setText(contact.getDisplayName());
role.setText(user.getName() + " \u2022 " + getReadableRole(user.getRole()));
} else { } else {
bm = UIHelper.getContactPicture(user.getName(), 48, this, bm = UIHelper.getContactPicture(user.getName(), 48, this,
false); false);
name.setText(user.getName()); name.setText(user.getName());
role.setText(getReadableRole(user.getRole()));
} }
} else { } else {
bm = UIHelper bm = UIHelper
.getContactPicture(user.getName(), 48, this, false); .getContactPicture(user.getName(), 48, this, false);
name.setText(user.getName()); name.setText(user.getName());
role.setText(getReadableRole(user.getRole()));
} }
ImageView iv = (ImageView) view.findViewById(R.id.contact_photo); ImageView iv = (ImageView) view.findViewById(R.id.contact_photo);
iv.setImageBitmap(bm); iv.setImageBitmap(bm);